From b85775900d084e3d27f269c3bd336b9aa356b98d Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 12 Sep 2018 15:56:30 -0700 Subject: replace malloc macros in imports.h with u_memory.h versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Reviewed-by: Kristian H. Kristensen Reviewed-by: Matt Turner Part-of: --- src/mesa/drivers/common/meta.c | 1 + src/mesa/drivers/dri/i915/intel_buffer_objects.c | 1 + src/mesa/drivers/dri/i915/intel_fbo.c | 1 + src/mesa/drivers/dri/i915/intel_screen.c | 1 + src/mesa/drivers/dri/i915/intel_tex.c | 1 + src/mesa/drivers/dri/i965/brw_program_cache.c | 1 + src/mesa/drivers/dri/i965/gen6_sol.c | 1 + src/mesa/drivers/dri/i965/intel_buffer_objects.c | 1 + src/mesa/drivers/dri/i965/intel_fbo.c | 1 + src/mesa/drivers/dri/i965/intel_screen.c | 1 + src/mesa/drivers/dri/i965/intel_tex.c | 1 + src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c | 1 + src/mesa/drivers/dri/nouveau/nouveau_fbo.c | 1 + src/mesa/drivers/dri/nouveau/nouveau_screen.c | 1 + src/mesa/drivers/dri/nouveau/nouveau_texture.c | 1 + src/mesa/drivers/dri/nouveau/nv04_context.c | 1 + src/mesa/drivers/dri/nouveau/nv10_context.c | 1 + src/mesa/drivers/dri/nouveau/nv20_context.c | 1 + src/mesa/drivers/dri/r200/r200_tex.c | 1 + src/mesa/drivers/dri/radeon/radeon_buffer_objects.c | 1 + src/mesa/drivers/dri/radeon/radeon_dma.c | 1 + src/mesa/drivers/dri/radeon/radeon_fbo.c | 1 + src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c | 1 + src/mesa/drivers/dri/radeon/radeon_screen.c | 1 + src/mesa/drivers/dri/radeon/radeon_tex.c | 1 + src/mesa/drivers/dri/swrast/swrast.c | 1 + src/mesa/drivers/osmesa/osmesa.c | 1 + src/mesa/drivers/x11/xm_api.c | 1 + src/mesa/drivers/x11/xm_buffer.c | 1 + src/mesa/drivers/x11/xm_dd.c | 1 + 30 files changed, 30 insertions(+) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 617f6ea4a84..ea096d585fd 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -90,6 +90,7 @@ #include "util/ralloc.h" #include "compiler/nir/nir.h" #include "util/u_math.h" +#include "util/u_memory.h" /** Return offset in bytes of the field within a vertex struct */ #define OFFSET(FIELD) ((void *) offsetof(struct vertex, FIELD)) diff --git a/src/mesa/drivers/dri/i915/intel_buffer_objects.c b/src/mesa/drivers/dri/i915/intel_buffer_objects.c index 6353c11ea32..841808b7e3d 100644 --- a/src/mesa/drivers/dri/i915/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/i915/intel_buffer_objects.c @@ -30,6 +30,7 @@ #include "main/mtypes.h" #include "main/macros.h" #include "main/bufferobj.h" +#include "util/u_memory.h" #include "intel_blit.h" #include "intel_buffer_objects.h" diff --git a/src/mesa/drivers/dri/i915/intel_fbo.c b/src/mesa/drivers/dri/i915/intel_fbo.c index 4f4a2fe96b9..2e00e803b58 100644 --- a/src/mesa/drivers/dri/i915/intel_fbo.c +++ b/src/mesa/drivers/dri/i915/intel_fbo.c @@ -37,6 +37,7 @@ #include "main/teximage.h" #include "main/image.h" +#include "util/u_memory.h" #include "swrast/swrast.h" #include "drivers/common/meta.h" diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index b84dfcaa136..bdf97522a05 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -41,6 +41,7 @@ #include "utils.h" #include "util/xmlpool.h" +#include "util/u_memory.h" static const __DRIconfigOptionsExtension i915_config_options = { .base = { __DRI_CONFIG_OPTIONS, 1 }, diff --git a/src/mesa/drivers/dri/i915/intel_tex.c b/src/mesa/drivers/dri/i915/intel_tex.c index 0b24c7e935b..801aeb28ca5 100644 --- a/src/mesa/drivers/dri/i915/intel_tex.c +++ b/src/mesa/drivers/dri/i915/intel_tex.c @@ -4,6 +4,7 @@ #include "main/teximage.h" #include "main/mipmap.h" #include "drivers/common/meta.h" +#include "util/u_memory.h" #include "intel_context.h" #include "intel_mipmap_tree.h" #include "intel_tex.h" diff --git a/src/mesa/drivers/dri/i965/brw_program_cache.c b/src/mesa/drivers/dri/i965/brw_program_cache.c index 62d5c4dc991..30be02fa253 100644 --- a/src/mesa/drivers/dri/i965/brw_program_cache.c +++ b/src/mesa/drivers/dri/i965/brw_program_cache.c @@ -54,6 +54,7 @@ #include "brw_cs.h" #include "brw_program.h" #include "compiler/brw_eu.h" +#include "util/u_memory.h" #define FILE_DEBUG_FLAG DEBUG_STATE diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c b/src/mesa/drivers/dri/i965/gen6_sol.c index bda015e6cc5..6c8d2af124f 100644 --- a/src/mesa/drivers/dri/i965/gen6_sol.c +++ b/src/mesa/drivers/dri/i965/gen6_sol.c @@ -33,6 +33,7 @@ #include "brw_defines.h" #include "brw_state.h" #include "main/transformfeedback.h" +#include "util/u_memory.h" static void gen6_update_sol_surfaces(struct brw_context *brw) diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/src/mesa/drivers/dri/i965/intel_buffer_objects.c index 7528248f62e..c0862b5e72a 100644 --- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.c @@ -35,6 +35,7 @@ #include "main/streaming-load-memcpy.h" #include "main/bufferobj.h" #include "x86/common_x86_asm.h" +#include "util/u_memory.h" #include "brw_context.h" #include "brw_blorp.h" diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c index 00071717383..cc450baf51e 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.c +++ b/src/mesa/drivers/dri/i965/intel_fbo.c @@ -36,6 +36,7 @@ #include "main/condrender.h" #include "util/hash_table.h" #include "util/set.h" +#include "util/u_memory.h" #include "swrast/swrast.h" #include "drivers/common/meta.h" diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index abc899c8163..822393f6731 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -45,6 +45,7 @@ #include "utils.h" #include "util/disk_cache.h" #include "util/xmlpool.h" +#include "util/u_memory.h" #include "common/gen_defines.h" diff --git a/src/mesa/drivers/dri/i965/intel_tex.c b/src/mesa/drivers/dri/i965/intel_tex.c index 0650b6e629c..b8341d5462b 100644 --- a/src/mesa/drivers/dri/i965/intel_tex.c +++ b/src/mesa/drivers/dri/i965/intel_tex.c @@ -10,6 +10,7 @@ #include "intel_mipmap_tree.h" #include "intel_tex.h" #include "intel_fbo.h" +#include "util/u_memory.h" #define FILE_DEBUG_FLAG DEBUG_TEXTURE diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c index afccf353960..5275f08e225 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c @@ -29,6 +29,7 @@ #include "nouveau_context.h" #include "main/bufferobj.h" +#include "util/u_memory.h" static inline char * get_bufferobj_map(struct gl_context *ctx, struct gl_buffer_object *obj, diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c index 77e7be1124c..581dfddb2c5 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c @@ -32,6 +32,7 @@ #include "main/framebuffer.h" #include "main/renderbuffer.h" #include "main/fbobject.h" +#include "util/u_memory.h" static GLboolean set_renderbuffer_format(struct gl_renderbuffer *rb, GLenum internalFormat) diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c index a3be805d048..ba85aacf741 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c @@ -38,6 +38,7 @@ #include "main/framebuffer.h" #include "main/fbobject.h" #include "main/renderbuffer.h" +#include "util/u_memory.h" #include "swrast/s_renderbuffer.h" #include diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index dc5699c7680..8afdbbeb3b3 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -38,6 +38,7 @@ #include "main/texgetimage.h" #include "main/mipmap.h" #include "main/teximage.h" +#include "util/u_memory.h" #include "drivers/common/meta.h" #include "swrast/s_texfetch.h" diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.c b/src/mesa/drivers/dri/nouveau/nv04_context.c index 093c7b85010..60a4e4892a9 100644 --- a/src/mesa/drivers/dri/nouveau/nv04_context.c +++ b/src/mesa/drivers/dri/nouveau/nv04_context.c @@ -30,6 +30,7 @@ #include "nouveau_util.h" #include "nv04_3d.xml.h" #include "nv04_driver.h" +#include "util/u_memory.h" static GLboolean texunit_needs_combiners(struct gl_texture_unit *u, diff --git a/src/mesa/drivers/dri/nouveau/nv10_context.c b/src/mesa/drivers/dri/nouveau/nv10_context.c index 6af1b1d5a3a..93a490b5986 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_context.c +++ b/src/mesa/drivers/dri/nouveau/nv10_context.c @@ -26,6 +26,7 @@ #include #include "main/state.h" +#include "util/u_memory.h" #include "nouveau_driver.h" #include "nouveau_context.h" #include "nouveau_fbo.h" diff --git a/src/mesa/drivers/dri/nouveau/nv20_context.c b/src/mesa/drivers/dri/nouveau/nv20_context.c index 887aa5f483f..01fece4466a 100644 --- a/src/mesa/drivers/dri/nouveau/nv20_context.c +++ b/src/mesa/drivers/dri/nouveau/nv20_context.c @@ -34,6 +34,7 @@ #include "nv04_driver.h" #include "nv10_driver.h" #include "nv20_driver.h" +#include "util/u_memory.h" static void nv20_clear(struct gl_context *ctx, GLbitfield buffers) diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c index 425ad538c04..c1d0717361c 100644 --- a/src/mesa/drivers/dri/r200/r200_tex.c +++ b/src/mesa/drivers/dri/r200/r200_tex.c @@ -45,6 +45,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r200_ioctl.h" #include "r200_tex.h" +#include "util/u_memory.h" #include "util/xmlpool.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c index 4bb0078aba5..8332534c814 100644 --- a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c +++ b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c @@ -28,6 +28,7 @@ #include "util/imports.h" #include "main/mtypes.h" #include "main/bufferobj.h" +#include "util/u_memory.h" #include "radeon_common.h" #include "radeon_buffer_objects.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c index 99c73d6ffcd..2601f1f318d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_dma.c +++ b/src/mesa/drivers/dri/radeon/radeon_dma.c @@ -34,6 +34,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_common.h" #include "radeon_fog.h" #include "util/simple_list.h" +#include "util/u_memory.h" #if defined(USE_X86_ASM) #define COPY_DWORDS( dst, src, nr ) \ diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c index e04ae54ad80..6105a9cf916 100644 --- a/src/mesa/drivers/dri/radeon/radeon_fbo.c +++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c @@ -36,6 +36,7 @@ #include "main/context.h" #include "swrast/swrast.h" #include "drivers/common/meta.h" +#include "util/u_memory.h" #include "radeon_common.h" #include "radeon_mipmap_tree.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c index 979739d62be..09ccc5c6a12 100644 --- a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c +++ b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c @@ -34,6 +34,7 @@ #include "main/teximage.h" #include "main/texobj.h" #include "main/enums.h" +#include "util/u_memory.h" #include "radeon_texture.h" #include "radeon_tile.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 2bf004e4f90..c5bd995fe9d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -42,6 +42,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/framebuffer.h" #include "main/renderbuffer.h" #include "main/fbobject.h" +#include "util/u_memory.h" #include "swrast/s_renderbuffer.h" #include "radeon_chipset.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c index 3db6cbeb71e..bdae54eecad 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tex.c +++ b/src/mesa/drivers/dri/radeon/radeon_tex.c @@ -44,6 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_ioctl.h" #include "radeon_tex.h" +#include "util/u_memory.h" #include "util/xmlpool.h" diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index 827f22cb5cc..1c1ecb66efd 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@ -53,6 +53,7 @@ #include "drivers/common/driverfuncs.h" #include "drivers/common/meta.h" #include "utils.h" +#include "util/u_memory.h" #include "main/teximage.h" #include "main/texformat.h" diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 3635e305b8b..43ba716c035 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -60,6 +60,7 @@ #include "drivers/common/driverfuncs.h" #include "drivers/common/meta.h" #include "vbo/vbo.h" +#include "util/u_memory.h" #define OSMESA_RENDERBUFFER_CLASS 0x053 diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index d2b169332b7..61a1ea8a350 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -84,6 +84,7 @@ #include "tnl/t_pipeline.h" #include "drivers/common/driverfuncs.h" #include "drivers/common/meta.h" +#include "util/u_memory.h" /** * Global X driver lock diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c index 9e16726535c..d251cd4b93b 100644 --- a/src/mesa/drivers/x11/xm_buffer.c +++ b/src/mesa/drivers/x11/xm_buffer.c @@ -37,6 +37,7 @@ #include "main/framebuffer.h" #include "main/renderbuffer.h" #include "swrast/s_renderbuffer.h" +#include "util/u_memory.h" #define XMESA_RENDERBUFFER 0x1234 diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index 16884af48f9..9872115f96d 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -48,6 +48,7 @@ #include "tnl/t_context.h" #include "drivers/common/meta.h" #include "xmesaP.h" +#include "util/u_memory.h" static void -- cgit v1.2.3