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>

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,

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.

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"
 

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))

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"

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"
 

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 },

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"

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
 

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)

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"

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"

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"
 

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
 

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,

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)

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>

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"
 

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,

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"

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)

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"
 
 

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"

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 )					\

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"

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"
 

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"

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"
 
 

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"

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

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

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

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

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

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
 

src/mesa/main/attrib.c

@@ -60,6 +60,7 @@
 #include "state.h"
 #include "hash.h"
 #include <stdbool.h>
+#include "util/u_memory.h"
 
 
 /**

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 */

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

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;

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
 

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

src/mesa/main/framebuffer.c

@@ -45,6 +45,7 @@
 #include "texobj.h"
 #include "glformats.h"
 #include "state.h"
+#include "util/u_memory.h"
 
 
 

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"
 
 
 /**

src/mesa/main/queryobj.c

@@ -31,6 +31,7 @@
 #include "util/imports.h"
 #include "queryobj.h"
 #include "mtypes.h"
+#include "util/u_memory.h"
 
 
 /**

src/mesa/main/renderbuffer.c

@@ -30,6 +30,7 @@
 #include "formats.h"
 #include "mtypes.h"
 #include "renderbuffer.h"
+#include "util/u_memory.h"
 
 
 /**

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 *

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);

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"
 

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"
 
 
 

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.

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;

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"

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

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"

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 *);

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"
 

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"

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

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"

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"
 

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"
 

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"

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"

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"
 

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 {

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"

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"

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