[Mesa-dev] [PATCH 24/28] replace malloc macros in imports.h with u_memory.h versions
Dylan Baker
dylan at pnwbakers.com
Fri Nov 9 18:40:17 UTC 2018
---
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c | 1 +
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 2 ++
src/gallium/state_trackers/dri/dri_context.c | 2 ++
src/gallium/state_trackers/glx/xlib/glx_api.c | 1 +
src/gallium/state_trackers/glx/xlib/xm_api.c | 1 +
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 +
src/mesa/main/arrayobj.c | 1 +
src/mesa/main/atifragshader.c | 1 +
src/mesa/main/attrib.c | 1 +
src/mesa/main/bufferobj.c | 1 +
src/mesa/main/context.c | 1 +
src/mesa/main/debug_output.c | 1 +
src/mesa/main/dlist.c | 1 +
src/mesa/main/externalobjects.c | 1 +
src/mesa/main/framebuffer.c | 1 +
src/mesa/main/hash.c | 1 +
src/mesa/main/imports.h | 13 -------------
src/mesa/main/queryobj.c | 1 +
src/mesa/main/renderbuffer.c | 1 +
src/mesa/main/samplerobj.c | 1 +
src/mesa/main/shared.c | 1 +
src/mesa/main/syncobj.c | 1 +
src/mesa/main/texobj.c | 1 +
src/mesa/main/texturebindless.c | 1 +
src/mesa/main/transformfeedback.c | 2 ++
src/mesa/main/vdpau.c | 1 +
src/mesa/program/prog_cache.c | 1 +
src/mesa/program/prog_parameter.c | 1 +
src/mesa/program/program_parse.y | 1 +
src/mesa/state_tracker/st_cb_syncobj.c | 1 +
src/mesa/state_tracker/st_cb_xformfb.c | 1 +
src/mesa/state_tracker/st_manager.c | 1 +
src/mesa/state_tracker/st_program.c | 2 ++
src/mesa/swrast/s_renderbuffer.c | 1 +
src/mesa/swrast/s_texture.c | 1 +
src/mesa/tnl/t_context.c | 1 +
src/mesa/tnl/t_vertex.c | 1 +
src/mesa/vbo/vbo_context.c | 1 +
src/mesa/vbo/vbo_minmax_index.c | 1 +
src/mesa/vbo/vbo_save_api.c | 1 +
src/util/hash_table.c | 1 +
70 files changed, 73 insertions(+), 13 deletions(-)
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
index 8f901e11d26..c8805de54b8 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
@@ -37,6 +37,7 @@
#include <unistd.h>
#include "util/u_atomic.h"
+#include "util/u_memory.h"
static void radv_amdgpu_winsys_bo_destroy(struct radeon_winsys_bo *_bo);
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
index cd8b13813d2..213ee3196e5 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -29,6 +29,8 @@
#include <pthread.h>
#include <errno.h>
+#include "util/u_memory.h"
+
#include "ac_debug.h"
#include "radv_radeon_winsys.h"
#include "radv_amdgpu_cs.h"
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c
index af9e3325f98..dc0c536adbe 100644
--- a/src/gallium/state_trackers/dri/dri_context.c
+++ b/src/gallium/state_trackers/dri/dri_context.c
@@ -40,6 +40,8 @@
#include "pipe-loader/pipe_loader.h"
#include "state_tracker/st_context.h"
+#include "util/u_memory.h"
+
GLboolean
dri_create_context(gl_api api, const struct gl_config * visual,
__DRIcontext * cPriv,
diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 97c3913b5a4..dee0cfadfeb 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -42,6 +42,7 @@
#include "main/imports.h"
#include "main/errors.h"
#include "util/u_math.h"
+#include "util/u_memory.h"
/* An "Atrribs/Attribs" typo was fixed in glxproto.h in Nov 2014.
* This is in case we don't have the updated header.
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index 86d27c42d6f..ae3e528da31 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -66,6 +66,7 @@
#include "util/u_atomic.h"
#include "util/u_inlines.h"
#include "util/u_math.h"
+#include "util/u_memory.h"
#include "hud/hud_context.h"
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 89dc8b26d52..8d2a7e9fcc2 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -90,6 +90,7 @@
#include "compiler/nir/nir.h"
#include "util/u_math.h"
#include "util/u_string.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 e6760964909..f4e9fcfefee 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 78e2c1e6614..a768005b36c 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 2cf7d9de4fb..cf04cf8f6dc 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -40,6 +40,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 600b0611c8b..98820fbf1b4 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 a2d2606a35d..41a5031f8a4 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 452e6d33c07..b8439ecd71a 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 2bbbc34114c..74f05f0d014 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 a205a49a1bd..90491fa63a8 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -44,6 +44,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 <nvif/class.h>
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 324595e2403..e890a27a7cd 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 be2178fb79e..bd9e9bc3904 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_context.c
@@ -26,6 +26,7 @@
#include <stdbool.h>
#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 1b217b9ed2b..cbfda0e4241 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 2b76305dd45..4c81afbc84c 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 "main/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 4c1c5d046fd..6621491e253 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 439b95bf7b1..c92ec554b04 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 7f02143e08a..db1b7e34542 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 9e7887de769..af7c75a1d74 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 da5d469e04c..bc5bdc9734e 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 94758e60862..85788c23b46 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -52,6 +52,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 9f25f4f9a47..e21ffee6270 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 6ff1269d07d..bbb93c47310 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -85,6 +85,7 @@
#include "drivers/common/driverfuncs.h"
#include "drivers/common/meta.h"
#include "util/u_math.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 d945d8af556..781b2a448d2 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 3c576c7cd8b..a25debc9887 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
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index ad34282afc8..3b93fd23ca2 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -54,6 +54,7 @@
#include "util/bitscan.h"
#include "util/u_atomic.h"
#include "util/u_math.h"
+#include "util/u_memory.h"
const GLubyte
diff --git a/src/mesa/main/atifragshader.c b/src/mesa/main/atifragshader.c
index a9356ae95b1..5e08e258b22 100644
--- a/src/mesa/main/atifragshader.c
+++ b/src/mesa/main/atifragshader.c
@@ -30,6 +30,7 @@
#include "main/mtypes.h"
#include "main/atifragshader.h"
#include "program/program.h"
+#include "util/u_memory.h"
#define MESA_DEBUG_ATI_FS 0
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index a46fec73fdf..7abafed9d17 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -59,6 +59,7 @@
#include "state.h"
#include "hash.h"
#include <stdbool.h>
+#include "util/u_memory.h"
/**
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 534326858bb..dda9efc3c6e 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -47,6 +47,7 @@
#include "transformfeedback.h"
#include "varray.h"
#include "util/u_atomic.h"
+#include "util/u_memory.h"
/* Debug flags */
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 492f01de957..0e5a698094b 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -150,6 +150,7 @@
#include "compiler/glsl_types.h"
#include "compiler/glsl/glsl_parser_extras.h"
#include <stdbool.h>
+#include "util/u_memory.h"
#ifndef MESA_VERBOSE
diff --git a/src/mesa/main/debug_output.c b/src/mesa/main/debug_output.c
index b2a4fb5c2da..bac150c8ce4 100644
--- a/src/mesa/main/debug_output.c
+++ b/src/mesa/main/debug_output.c
@@ -34,6 +34,7 @@
#include "version.h"
#include "util/hash_table.h"
#include "util/simple_list.h"
+#include "util/u_memory.h"
static simple_mtx_t DynamicIDMutex = _SIMPLE_MTX_INITIALIZER_NP;
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index c530e118dd3..663e9344994 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -71,6 +71,7 @@
#include "vbo/vbo.h"
#include "util/u_string.h"
+#include "util/u_memory.h"
#define USE_BITMAP_ATLAS 1
diff --git a/src/mesa/main/externalobjects.c b/src/mesa/main/externalobjects.c
index 56bf817a6e6..fc17d78b63e 100644
--- a/src/mesa/main/externalobjects.c
+++ b/src/mesa/main/externalobjects.c
@@ -30,6 +30,7 @@
#include "texobj.h"
#include "glformats.h"
#include "texstorage.h"
+#include "util/u_memory.h"
/**
* Allocate and initialize a new memory object. But don't put it into the
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 10dd2fde446..2d1d62898dd 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -45,6 +45,7 @@
#include "texobj.h"
#include "glformats.h"
#include "state.h"
+#include "util/u_memory.h"
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 902c5efc65a..99249c4be18 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -38,6 +38,7 @@
#include "glheader.h"
#include "hash.h"
#include "util/hash_table.h"
+#include "util/u_memory.h"
/**
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 1aaa9d88294..2454bee7015 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -47,19 +47,6 @@
extern "C" {
#endif
-
-/**********************************************************************/
-/** Memory macros */
-/*@{*/
-
-/** Allocate a structure of type \p T */
-#define MALLOC_STRUCT(T) (struct T *) malloc(sizeof(struct T))
-/** Allocate and zero a structure of type \p T */
-#define CALLOC_STRUCT(T) (struct T *) calloc(1, sizeof(struct T))
-
-/*@}*/
-
-
/*
* For GL_ARB_vertex_buffer_object we need to treat vertex array pointers
* as offsets into buffer stores. Since the vertex array pointer and
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index e97a0138e96..73883a31da5 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -31,6 +31,7 @@
#include "imports.h"
#include "queryobj.h"
#include "mtypes.h"
+#include "util/u_memory.h"
/**
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 0e017125ac0..a46fca33247 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -30,6 +30,7 @@
#include "formats.h"
#include "mtypes.h"
#include "renderbuffer.h"
+#include "util/u_memory.h"
/**
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index be7e8b39142..9b98cb83068 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -38,6 +38,7 @@
#include "main/mtypes.h"
#include "main/samplerobj.h"
#include "main/texturebindless.h"
+#include "util/u_memory.h"
struct gl_sampler_object *
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index b6de835acef..7a2ab0af725 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -43,6 +43,7 @@
#include "util/hash_table.h"
#include "util/set.h"
+#include "util/u_memory.h"
static void
free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared);
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 736f043f90c..ec85c52c523 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -64,6 +64,7 @@
#include "mtypes.h"
#include "util/hash_table.h"
#include "util/set.h"
+#include "util/u_memory.h"
#include "syncobj.h"
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 5dc5cb8e1a9..824e2f43ea3 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -44,6 +44,7 @@
#include "mtypes.h"
#include "program/prog_instruction.h"
#include "texturebindless.h"
+#include "util/u_memory.h"
diff --git a/src/mesa/main/texturebindless.c b/src/mesa/main/texturebindless.c
index 9aaa0367c2d..30a50872eb7 100644
--- a/src/mesa/main/texturebindless.c
+++ b/src/mesa/main/texturebindless.c
@@ -33,6 +33,7 @@
#include "texturebindless.h"
#include "util/hash_table.h"
+#include "util/u_memory.h"
/**
* Return the gl_texture_handle_object for a given 64-bit handle.
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index a46c9f94bca..88e959a0f73 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -42,6 +42,8 @@
#include "program/prog_parameter.h"
+#include "util/u_memory.h"
+
struct using_program_tuple
{
struct gl_program *prog;
diff --git a/src/mesa/main/vdpau.c b/src/mesa/main/vdpau.c
index 051071beb5f..6a96c40bdb8 100644
--- a/src/mesa/main/vdpau.c
+++ b/src/mesa/main/vdpau.c
@@ -34,6 +34,7 @@
#include <stdbool.h>
#include "util/hash_table.h"
#include "util/set.h"
+#include "util/u_memory.h"
#include "context.h"
#include "glformats.h"
#include "texobj.h"
diff --git a/src/mesa/program/prog_cache.c b/src/mesa/program/prog_cache.c
index ed93af7f13a..1fff0b480bd 100644
--- a/src/mesa/program/prog_cache.c
+++ b/src/mesa/program/prog_cache.c
@@ -32,6 +32,7 @@
#include "main/shaderobj.h"
#include "program/prog_cache.h"
#include "program/program.h"
+#include "util/u_memory.h"
struct cache_item
diff --git a/src/mesa/program/prog_parameter.c b/src/mesa/program/prog_parameter.c
index 2bc1b6db6eb..26904575bd6 100644
--- a/src/mesa/program/prog_parameter.c
+++ b/src/mesa/program/prog_parameter.c
@@ -32,6 +32,7 @@
#include "main/glheader.h"
#include "main/imports.h"
#include "main/macros.h"
+#include "util/u_memory.h"
#include "prog_instruction.h"
#include "prog_parameter.h"
#include "prog_statevars.h"
diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y
index 1a5b3f90f3d..d291b92b81c 100644
--- a/src/mesa/program/program_parse.y
+++ b/src/mesa/program/program_parse.y
@@ -40,6 +40,7 @@
#include "program/program_parser.h"
#include "util/u_math.h"
+#include "util/u_memory.h"
#include "util/u_string.h"
extern void *yy_scan_string(char *);
diff --git a/src/mesa/state_tracker/st_cb_syncobj.c b/src/mesa/state_tracker/st_cb_syncobj.c
index 44323b4750a..613cf301dc4 100644
--- a/src/mesa/state_tracker/st_cb_syncobj.c
+++ b/src/mesa/state_tracker/st_cb_syncobj.c
@@ -34,6 +34,7 @@
#include "main/macros.h"
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
+#include "util/u_memory.h"
#include "st_context.h"
#include "st_cb_syncobj.h"
diff --git a/src/mesa/state_tracker/st_cb_xformfb.c b/src/mesa/state_tracker/st_cb_xformfb.c
index 4be9a7f659e..4fb35522906 100644
--- a/src/mesa/state_tracker/st_cb_xformfb.c
+++ b/src/mesa/state_tracker/st_cb_xformfb.c
@@ -37,6 +37,7 @@
#include "main/bufferobj.h"
#include "main/context.h"
#include "main/transformfeedback.h"
+#include "util/u_memory.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_xformfb.h"
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index ceb48dd4903..b88e21292f7 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -62,6 +62,7 @@
#include "util/u_atomic.h"
#include "util/u_surface.h"
#include "util/list.h"
+#include "util/u_memory.h"
struct hash_table;
struct st_manager_private
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 3bc7b0649c4..ab16309b715 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -50,6 +50,8 @@
#include "tgsi/tgsi_parse.h"
#include "tgsi/tgsi_ureg.h"
+#include "util/u_memory.h"
+
#include "st_debug.h"
#include "st_cb_bitmap.h"
#include "st_cb_drawpixels.h"
diff --git a/src/mesa/swrast/s_renderbuffer.c b/src/mesa/swrast/s_renderbuffer.c
index ab4932728a9..753ee938518 100644
--- a/src/mesa/swrast/s_renderbuffer.c
+++ b/src/mesa/swrast/s_renderbuffer.c
@@ -37,6 +37,7 @@
#include "main/formats.h"
#include "main/mtypes.h"
#include "main/renderbuffer.h"
+#include "util/u_memory.h"
#include "swrast/s_context.h"
#include "swrast/s_renderbuffer.h"
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index b41cd5d57ae..88b4e87c62a 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -31,6 +31,7 @@
#include "main/fbobject.h"
#include "main/teximage.h"
#include "main/texobj.h"
+#include "util/u_memory.h"
#include "swrast/swrast.h"
#include "swrast/s_context.h"
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 3383b235250..7fd766cba8d 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -37,6 +37,7 @@
#include "main/state.h"
#include "main/viewport.h"
#include "util/simple_list.h"
+#include "util/u_memory.h"
#include "tnl.h"
#include "t_context.h"
diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c
index 76ff97720ca..baea953b88f 100644
--- a/src/mesa/tnl/t_vertex.c
+++ b/src/mesa/tnl/t_vertex.c
@@ -29,6 +29,7 @@
#include "main/glheader.h"
#include "main/context.h"
#include "main/execmem.h"
+#include "util/u_memory.h"
#include "swrast/s_chan.h"
#include "t_context.h"
#include "t_vertex.h"
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index 364de2c507e..52fcd1f581d 100644
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -32,6 +32,7 @@
#include "main/api_arrayelt.h"
#include "main/arrayobj.h"
#include "main/varray.h"
+#include "util/u_memory.h"
#include "vbo.h"
#include "vbo_private.h"
diff --git a/src/mesa/vbo/vbo_minmax_index.c b/src/mesa/vbo/vbo_minmax_index.c
index d1298dcdc3a..75fb051bee6 100644
--- a/src/mesa/vbo/vbo_minmax_index.c
+++ b/src/mesa/vbo/vbo_minmax_index.c
@@ -33,6 +33,7 @@
#include "main/sse_minmax.h"
#include "x86/common_x86_asm.h"
#include "util/hash_table.h"
+#include "util/u_memory.h"
struct minmax_cache_key {
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 05c894328e7..7de7c97eaeb 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -82,6 +82,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/state.h"
#include "main/varray.h"
#include "util/bitscan.h"
+#include "util/u_memory.h"
#include "vbo_noop.h"
#include "vbo_private.h"
diff --git a/src/util/hash_table.c b/src/util/hash_table.c
index fc152f84a4d..9a7f55c124e 100644
--- a/src/util/hash_table.c
+++ b/src/util/hash_table.c
@@ -48,6 +48,7 @@
#include "ralloc.h"
#include "macros.h"
#include "main/hash.h"
+#include "util/u_memory.h"
static const uint32_t deleted_key_value;
--
2.19.1
More information about the mesa-dev
mailing list