replace malloc macros in imports.h with u_memory.h versions

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3024>

diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c
index 6efca4f8f809af05aa58debad84b0674d9287c0e..082a9ced91de8ed69a915d2519293af34875e793 100644 (file)
--- 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 c820926790f49223dca56fc851872ec9ae99c515..c4e38bdbf17ac17b4699f25584ba89c2902c8428 100644 (file)
--- 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 "util/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 094b16721abc8c6ae4161fa15a6a848f545a3045..9dce0d594c53a99d3ff57bd4cba247426c471abb 100644 (file)
--- 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 617f6ea4a84798f74e8c03b63c4423c46ab3b336..ea096d585fde8941039200fdffe8711d612b0431 100644 (file)
--- 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 6353c11ea3256c29ebb85467e7c6e2922fc710ad..841808b7e3d42e3403e73de4415a847a49fea362 100644 (file)
--- 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 4f4a2fe96b904fd4e70be4a7d22f888b624c0ce4..2e00e803b58722f6f98ec4717207dc8f2ddebff8 100644 (file)
--- 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 b84dfcaa136dd4901705cc43aa730efaeed5157e..bdf97522a056df664beecddd4102f5021adf5956 100644 (file)
--- 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 0b24c7e935bbbd0abed8207d14b71eb0b42c1e8d..801aeb28ca57967dfc76d0cb8b27cf59793b36dc 100644 (file)
--- 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 62d5c4dc991cde6f794220460c28d6dff8742dfa..30be02fa253523ca472b67ac3ba08145079071bc 100644 (file)
--- 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 bda015e6cc5b74961f7937a83c3b99160d80d600..6c8d2af124fbf2c71850f94ab3d92c3dbfdf026d 100644 (file)
--- 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 7528248f62ebc5b1e2bd5740aa33675b8b94d111..c0862b5e72ac3a07fb0e58abc69d0853401180f6 100644 (file)
--- 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 000717173832183fd5b1079830c51b64006a4db5..cc450baf51e3d9aec0a461db836f4bf0a8077365 100644 (file)
--- 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 abc899c8163e95e0ca79c87c794b0d6780cd2774..822393f67312744ad02ac895de7ff3e2a1b21fd9 100644 (file)
--- 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 0650b6e629c6b5f60e80b2269314d2cba81f9b9b..b8341d5462b657f54ae737a4b2a2b68b9891c9a2 100644 (file)
--- 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 afccf353960d02222119ab944c145f667852ed2b..5275f08e2250e66a90586a8bb502b3bb0bec2629 100644 (file)
--- 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 77e7be1124c15bc5957a59bc904a758f05443c13..581dfddb2c52ad35e68525f87a8e11ece972eb32 100644 (file)
--- 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 a3be805d048483c122bf426301ab43d6ff780364..ba85aacf74122812ef374e5ffef4fca437076bca 100644 (file)
--- 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 dc5699c76809681c0f59c96515bfc034dc50b542..8afdbbeb3b355bbd0aeb4c621ea9360904e110c4 100644 (file)
--- 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 093c7b850105b131965ba4b43d8216e286ea344f..60a4e4892a9661d5deb66dd0d7917c195a70639b 100644 (file)
--- 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 6af1b1d5a3a9fd9b20a8b7cf0f45d9456924b918..93a490b59867a645c0fb0fb70375f4c7f72be0fc 100644 (file)
--- 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 887aa5f483f1a499c8a0fd9b647f78534a5942bb..01fece4466adf21d58b360a862030e91e17ae620 100644 (file)
--- 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 425ad538c04052b42d8f566683387bf92ae79c7e..c1d0717361cb95a2115a05c0f2776026228f7da6 100644 (file)
--- 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 4bb0078aba54d13b96eb2aedde258b5c86d699bc..8332534c8149194bc84da423fd2e063708dbf330 100644 (file)
--- 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 99c73d6ffcdc84302d14b6bc470818ef50d8ecae..2601f1f318dbc2a683b2d97a55f78cad98f2a457 100644 (file)
--- 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 e04ae54ad809752205e6879d78e57cf0b6d7c795..6105a9cf91642d90faf0d7ce18bb419ea8ea571d 100644 (file)
--- 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 979739d62bef74bef31f5c887f13202c00d7cbf8..09ccc5c6a12ec5a6d519b778f9abb61633ffd17a 100644 (file)
--- 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 2bf004e4f904b47354aad0a33c6d1a393032a25f..c5bd995fe9dcd46158ab4a29a3d5a52e9544627e 100644 (file)
--- 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 3db6cbeb71ec7fde26d2bb8078887981dd260801..bdae54eecad50d418b5152989f9600f67acda52a 100644 (file)
--- 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 827f22cb5ccc1352c336951bbd80dca3f41e043e..1c1ecb66efd7deee4e52d2aa48b12bea9818d7d3 100644 (file)
--- 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 3635e305b8b13952d1ed73418ec825b4a6411089..43ba716c035630e484a6ebc92dd39a33de53c1a7 100644 (file)
--- 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 d2b169332b70e209da814abd58caf8a1d3694105..61a1ea8a35001fe57bbc424392014707898c82f2 100644 (file)
--- 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 9e16726535c130991b4389e706cbf969fbab72a5..d251cd4b93b68d4c15561d9313a6326a3afa9724 100644 (file)
--- 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 16884af48f9ef087cbb89325e0d59fdfd06e6366..9872115f96d4437b11083397c9983cef878e8759 100644 (file)
--- 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 cba5cbdb01a865a0fa303c48b70d877e5111070b..bbb79fb03e7237a7a75dd426fd4061afae6ff293 100644 (file)
--- 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 75998f97bb821c087161dc4e0e52edc1b4eb5261..4d9ddcc56ef030e44d44a5cc5a2ae58797c9e133 100644 (file)
--- 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 5aa3f7bf067c4b7e21c91f7d29ce00a08dfe3d68..d2bcdb8373f0669e9a7139e2e69df629b7c9f00b 100644 (file)
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -60,6 +60,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 222b91eb6c1dbdd73e1c8f20e25729964be4f944..fdd5a9081083a4f4c99d6151f3cf1f971dc8f0c8 100644 (file)
--- 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 f9c8d22820a5fe9e9661b24485fbeb0557dc7cf3..16283febef1ea7cb7289da0418bad38f3316985a 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -152,6 +152,7 @@
 #include "compiler/glsl/builtin_functions.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 d643866c55a3b23944742d16eac9cc5dde5a2ba5..e212ed965b991fee80dfac0d4d4a0b15ff934325 100644 (file)
--- 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/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 4f4e28321cef0eca42ddcdfdf900f9d6f6763635..89d2e8a12a065cce807ad515731d08ee8784b182 100644 (file)
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -73,6 +73,7 @@
 #include "vbo/vbo_util.h"
 #include "util/format_r11g11b10f.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 987aca2bd2844648bc416dae6dee805fc2888a16..777a5dd5acd0c799a570106a1be590d476347bd1 100644 (file)
--- 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 1cfc472c8fa96680364f9067133fb76ba800ad02..ae96168990109d1cad5870a9e87552bad5318e28 100644 (file)
--- 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 902c5efc65a670ff8f7b273ed8313b960bede7d3..99249c4be18b4c6024018aef7bcb73bc243aa9fd 100644 (file)
--- 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/queryobj.c b/src/mesa/main/queryobj.c
index 0bbc5cfb88779086e7ee3530319da3a216a8b8da..8577a57fbe4aa2672ceed2bc17efe8ec64a1b4ad 100644 (file)
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -31,6 +31,7 @@
 #include "util/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 34959776a6f68aac794276bc50b00a4ed50f773d..2624f01259d78d8302c06055bb8047ecc27b2ba7 100644 (file)
--- 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 449695dbac76973b1c678bd15e9b51b6633b17cc..fe1c0125341b804e5217928eee83c47f3c6b3bc7 100644 (file)
--- 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 46e2f9a16581951f65f0964bef2dcfc6a3400d1a..18e1d7501553aa652a83f4e753ff56fe9ef7bd03 100644 (file)
--- 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 41b7b22b0aeb2881346fcfb46652f36df972291e..838d2d00a02e2b524ba314b8d9d266da139f80dc 100644 (file)
--- 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 4dc1bb1eed03c69f524ed68b33dd0f5f3e8af359..684c34b2c06805dd4c0d532996a4445b30c72919 100644 (file)
--- 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 eddf0ee46848ad24a92eadddaec88642a9b5fd68..2e11b9f8c792590ec34712e3d5e40cfa560a8385 100644 (file)
--- 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 315233b2c6bf7f9997305b28490d3bcf5b3f65e2..5826447844ab51ae51abf61f63ca75ed82c43ced 100644 (file)
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -43,6 +43,8 @@
 #include "program/program.h"
 #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 051071beb5fa4f745e0cf70a4f95cc954c725b68..6a96c40bdb8fc345a7d7791d188421c14f01710a 100644 (file)
--- 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 33f74cd7ab2d6424e2dba345ce6371567eed73d9..d1cfc27837b9ee5a4d6aaebcf4e6dd1d6923e58f 100644 (file)
--- 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 80733e2b2f3019be94e99374b61daee91df6ac88..0dce7cb98013ab946388f18ea5bf28114fef5e60 100644 (file)
--- a/src/mesa/program/prog_parameter.c
+++ b/src/mesa/program/prog_parameter.c
@@ -32,6 +32,7 @@
 #include "main/glheader.h"
 #include "util/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 4e8e2eaf11e766a60f6537395913872637dc2b76..5e79bf7fcd47c6751d03406857720c890c2f136b 100644 (file)
--- 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"
 
 extern void *yy_scan_string(char *);
 extern void yy_delete_buffer(void *);

diff --git a/src/mesa/state_tracker/st_cb_syncobj.c b/src/mesa/state_tracker/st_cb_syncobj.c
index 2cbbc580c8cc26386156687d9e151e71e47dc7a5..a625f9f73f89057eb36a7c25b02f20fd6387faac 100644 (file)
--- 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 476eb9be02bc0d4eb7b2996cf7763123ded0bf4c..4126e64345b35d0c5a624181d50501c60c2b4b1d 100644 (file)
--- 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 79aa778a14ca428c6ed906de9780df9b0f2003df..67cc46a0c54ba993afe3923e1de82a8f29423024 100644 (file)
--- 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 54e9debf936fbd3194ecff01a4697b46757f4907..199825b55d5d85917c96ea8c9569ce85be7479bb 100644 (file)
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -53,6 +53,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 cf04eb093cb7c437c5f2528501af5a2a39a77437..df92b3c75756e07e59e26ea29b7d7c28bcc98abd 100644 (file)
--- 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 b41cd5d57ae5cd6aed44868eece232335b9106ed..88b4e87c62af3b2f88f524d00700cb897612cba9 100644 (file)
--- 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 ed068f708d00a28f83f09992527febd287a08f55..af87c1f86cfd4602821965bb8fdbc02996884298 100644 (file)
--- 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 76ff97720ca1cee6146d28606d593326debfe762..baea953b88f92074a60840b1025679916ac11580 100644 (file)
--- 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 ad23655e6f0a9f0113b1e8fe546be0b3d0c5f958..06786e13bdb7452e1b9e0f34882a560a1af49113 100644 (file)
--- 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 ed3d5c607de8d36567ca895d4a035d611ad889d3..62c8b6466f6f151b05b66539fc907f891b783cd1 100644 (file)
--- 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 4e96fc79343bd71c6f4016c43e6b8a4df502a12b..1e09f7dbb899ea10916a0f12a0b2a9d6e4ef8e16 100644 (file)
--- 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 939c03c19ee403bdb224c02b056c8b95a0857293..0b0077cc7f3e6efddeac9db48d86419569fac2c5 100644 (file)
--- a/src/util/hash_table.c
+++ b/src/util/hash_table.c
@@ -49,6 +49,7 @@
 #include "macros.h"
 #include "u_memory.h"
 #include "fast_urem_by_const.h"
+#include "util/u_memory.h"
 
 #define XXH_INLINE_ALL
 #include "xxhash.h"

diff --git a/src/util/imports.h b/src/util/imports.h
index 783423bae81e94d6ec7aaafe49dc5e0a5f5a2af3..47c7d5931c4d97401d566146ef4e624d80624337 100644 (file)
--- a/src/util/imports.h
+++ b/src/util/imports.h
@@ -47,7 +47,6 @@
 extern "C" {
 #endif
 
-
 /*
  * For GL_ARB_vertex_buffer_object we need to treat vertex array pointers
  * as offsets into buffer stores.  Since the vertex array pointer and