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

Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Kristian H. Kristensen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3024>

19 files changed, 20 insertions, 0 deletions

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index cba5cbdb01a..bbb79fb03e7 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 75998f97bb8..4d9ddcc56ef 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 5aa3f7bf067..d2bcdb8373f 100644
--- 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 222b91eb6c1..fdd5a908108 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 f9c8d22820a..16283febef1 100644
--- 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 d643866c55a..e212ed965b9 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/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 4f4e28321ce..89d2e8a12a0 100644
--- 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 987aca2bd28..777a5dd5acd 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 1cfc472c8fa..ae961689901 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/queryobj.c b/src/mesa/main/queryobj.c
index 0bbc5cfb887..8577a57fbe4 100644
--- 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 34959776a6f..2624f01259d 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 449695dbac7..fe1c0125341 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 46e2f9a1658..18e1d750155 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 41b7b22b0ae..838d2d00a02 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 4dc1bb1eed0..684c34b2c06 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 eddf0ee4684..2e11b9f8c79 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 315233b2c6b..5826447844a 100644
--- 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 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"