diff options
Diffstat (limited to 'src')
68 files changed, 70 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c index 6efca4f8f80..082a9ced91d 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 c820926790f..c4e38bdbf17 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 "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 094b16721ab..9dce0d594c5 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 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 <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 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 <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 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 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" diff --git a/src/mesa/program/prog_cache.c b/src/mesa/program/prog_cache.c index 33f74cd7ab2..d1cfc27837b 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 80733e2b2f3..0dce7cb9801 100644 --- 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 4e8e2eaf11e..5e79bf7fcd4 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" 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 2cbbc580c8c..a625f9f73f8 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 476eb9be02b..4126e64345b 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 79aa778a14c..67cc46a0c54 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 54e9debf936..199825b55d5 100644 --- 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 cf04eb093cb..df92b3c7575 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 ed068f708d0..af87c1f86cf 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 ad23655e6f0..06786e13bdb 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 ed3d5c607de..62c8b6466f6 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 4e96fc79343..1e09f7dbb89 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 939c03c19ee..0b0077cc7f3 100644 --- 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 783423bae81..47c7d5931c4 100644 --- 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 |