[Mesa-dev] [PATCH 5/5] gallium: Add missing u_memory.h includes
nobled
nobled at dreamwidth.org
Wed Jun 23 18:33:04 PDT 2010
These files all use the capslock MALLOC family of macros but didn't
include the appropriate header. Thanks, grep.
---
src/gallium/auxiliary/draw/draw_llvm.c | 1 +
src/gallium/auxiliary/rbug/rbug_connection.c | 1 +
src/gallium/auxiliary/rbug/rbug_context.c | 2 ++
src/gallium/auxiliary/rbug/rbug_core.c | 2 ++
src/gallium/auxiliary/rbug/rbug_shader.c | 2 ++
src/gallium/auxiliary/rbug/rbug_texture.c | 2 ++
src/gallium/drivers/i965/brw_context.c | 1 +
src/gallium/drivers/i965/brw_pipe_query.c | 1 +
src/gallium/drivers/i965/brw_state_batch.c | 2 ++
src/gallium/drivers/i965/brw_wm.c | 1 +
src/gallium/drivers/llvmpipe/lp_state_vertex.c | 1 +
src/gallium/drivers/llvmpipe/lp_tex_sample.c | 1 +
src/gallium/drivers/nouveau/nouveau_stateobj.h | 1 +
src/gallium/drivers/nv50/nv50_context.c | 1 +
src/gallium/drivers/nv50/nv50_draw.c | 1 +
src/gallium/drivers/nv50/nv50_miptree.c | 1 +
src/gallium/drivers/nv50/nv50_program.c | 1 +
src/gallium/drivers/nv50/nv50_query.c | 1 +
src/gallium/drivers/nv50/nv50_screen.c | 1 +
src/gallium/drivers/nv50/nv50_state.c | 1 +
src/gallium/drivers/nv50/nv50_transfer.c | 1 +
src/gallium/drivers/nvfx/nvfx_context.c | 1 +
src/gallium/drivers/nvfx/nvfx_draw.c | 1 +
src/gallium/drivers/nvfx/nvfx_fragprog.c | 1 +
src/gallium/drivers/nvfx/nvfx_miptree.c | 1 +
src/gallium/drivers/nvfx/nvfx_query.c | 1 +
src/gallium/drivers/nvfx/nvfx_screen.c | 1 +
src/gallium/drivers/nvfx/nvfx_state.c | 1 +
src/gallium/drivers/nvfx/nvfx_vertprog.c | 1 +
src/gallium/drivers/r300/r300_flush.c | 1 +
src/gallium/drivers/r600/r600_compiler_r600.c | 3 ++-
31 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/gallium/auxiliary/draw/draw_llvm.c
b/src/gallium/auxiliary/draw/draw_llvm.c
index bd5d885..32cf789 100644
--- a/src/gallium/auxiliary/draw/draw_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_llvm.c
@@ -17,6 +17,7 @@
#include "util/u_cpu_detect.h"
#include "util/u_string.h"
#include "util/u_pointer.h"
+#include "util/u_memory.h"
#include <llvm-c/Transforms/Scalar.h>
diff --git a/src/gallium/auxiliary/rbug/rbug_connection.c
b/src/gallium/auxiliary/rbug/rbug_connection.c
index ae4e27f..4bbf48e 100644
--- a/src/gallium/auxiliary/rbug/rbug_connection.c
+++ b/src/gallium/auxiliary/rbug/rbug_connection.c
@@ -25,6 +25,7 @@
#include "rbug/rbug.h"
#include "rbug/rbug_internal.h"
+#include "util/u_memory.h"
#include "util/u_network.h"
struct rbug_connection
diff --git a/src/gallium/auxiliary/rbug/rbug_context.c
b/src/gallium/auxiliary/rbug/rbug_context.c
index 1832425..4c2b53d 100644
--- a/src/gallium/auxiliary/rbug/rbug_context.c
+++ b/src/gallium/auxiliary/rbug/rbug_context.c
@@ -34,6 +34,8 @@
* Functions ending with _reply are replies to requests.
*/
+#include "util/u_memory.h"
+
#include "rbug_internal.h"
#include "rbug/rbug_context.h"
diff --git a/src/gallium/auxiliary/rbug/rbug_core.c
b/src/gallium/auxiliary/rbug/rbug_core.c
index 876ae5a..ba07ccb 100644
--- a/src/gallium/auxiliary/rbug/rbug_core.c
+++ b/src/gallium/auxiliary/rbug/rbug_core.c
@@ -34,6 +34,8 @@
* Functions ending with _reply are replies to requests.
*/
+#include "util/u_memory.h"
+
#include "rbug_internal.h"
#include "rbug/rbug_core.h"
diff --git a/src/gallium/auxiliary/rbug/rbug_shader.c
b/src/gallium/auxiliary/rbug/rbug_shader.c
index fccd2f5..838c441 100644
--- a/src/gallium/auxiliary/rbug/rbug_shader.c
+++ b/src/gallium/auxiliary/rbug/rbug_shader.c
@@ -34,6 +34,8 @@
* Functions ending with _reply are replies to requests.
*/
+#include "util/u_memory.h"
+
#include "rbug_internal.h"
#include "rbug/rbug_shader.h"
diff --git a/src/gallium/auxiliary/rbug/rbug_texture.c
b/src/gallium/auxiliary/rbug/rbug_texture.c
index 5a918fe..808873a 100644
--- a/src/gallium/auxiliary/rbug/rbug_texture.c
+++ b/src/gallium/auxiliary/rbug/rbug_texture.c
@@ -34,6 +34,8 @@
* Functions ending with _reply are replies to requests.
*/
+#include "util/u_memory.h"
+
#include "rbug_internal.h"
#include "rbug/rbug_texture.h"
diff --git a/src/gallium/drivers/i965/brw_context.c
b/src/gallium/drivers/i965/brw_context.c
index 227bc79..fe41119 100644
--- a/src/gallium/drivers/i965/brw_context.c
+++ b/src/gallium/drivers/i965/brw_context.c
@@ -33,6 +33,7 @@
#include "pipe/p_context.h"
#include "util/u_inlines.h"
#include "util/u_simple_list.h"
+#include "util/u_memory.h"
#include "brw_context.h"
#include "brw_draw.h"
diff --git a/src/gallium/drivers/i965/brw_pipe_query.c
b/src/gallium/drivers/i965/brw_pipe_query.c
index 2eb8626..03f2b5a 100644
--- a/src/gallium/drivers/i965/brw_pipe_query.c
+++ b/src/gallium/drivers/i965/brw_pipe_query.c
@@ -39,6 +39,7 @@
* have to emit a batchbuffer without getting the ending PS_DEPTH_COUNT.
*/
#include "util/u_simple_list.h"
+#include "util/u_memory.h"
#include "brw_context.h"
#include "brw_state.h"
diff --git a/src/gallium/drivers/i965/brw_state_batch.c
b/src/gallium/drivers/i965/brw_state_batch.c
index ce5ed0a..eca2b0d 100644
--- a/src/gallium/drivers/i965/brw_state_batch.c
+++ b/src/gallium/drivers/i965/brw_state_batch.c
@@ -31,6 +31,8 @@
+#include "util/u_memory.h"
+
#include "brw_state.h"
#include "brw_batchbuffer.h"
diff --git a/src/gallium/drivers/i965/brw_wm.c
b/src/gallium/drivers/i965/brw_wm.c
index 5d66e61..ef154c7 100644
--- a/src/gallium/drivers/i965/brw_wm.c
+++ b/src/gallium/drivers/i965/brw_wm.c
@@ -29,6 +29,7 @@
* Keith Whitwell <keith at tungstengraphics.com>
*/
#include "tgsi/tgsi_info.h"
+#include "util/u_memory.h"
#include "brw_context.h"
#include "brw_screen.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_state_vertex.c
b/src/gallium/drivers/llvmpipe/lp_state_vertex.c
index 113f13d..6c5ae62 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_vertex.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_vertex.c
@@ -33,6 +33,7 @@
#include "lp_state.h"
#include "draw/draw_context.h"
+#include "util/u_memory.h"
static void *
diff --git a/src/gallium/drivers/llvmpipe/lp_tex_sample.c
b/src/gallium/drivers/llvmpipe/lp_tex_sample.c
index 65208dd..fe89a6d 100644
--- a/src/gallium/drivers/llvmpipe/lp_tex_sample.c
+++ b/src/gallium/drivers/llvmpipe/lp_tex_sample.c
@@ -46,6 +46,7 @@
#include "gallivm/lp_bld_type.h"
#include "gallivm/lp_bld_sample.h"
#include "gallivm/lp_bld_tgsi.h"
+#include "util/u_memory.h"
#include "lp_jit.h"
#include "lp_tex_sample.h"
diff --git a/src/gallium/drivers/nouveau/nouveau_stateobj.h
b/src/gallium/drivers/nouveau/nouveau_stateobj.h
index f5c1c5c..2bb3d7f 100644
--- a/src/gallium/drivers/nouveau/nouveau_stateobj.h
+++ b/src/gallium/drivers/nouveau/nouveau_stateobj.h
@@ -2,6 +2,7 @@
#define __NOUVEAU_STATEOBJ_H__
#include "util/u_debug.h"
+#include "util/u_memory.h"
#ifdef DEBUG
#define DEBUG_NOUVEAU_STATEOBJ
diff --git a/src/gallium/drivers/nv50/nv50_context.c
b/src/gallium/drivers/nv50/nv50_context.c
index 915a925..afd733c 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -22,6 +22,7 @@
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
+#include "util/u_memory.h"
#include "nv50_context.h"
#include "nv50_screen.h"
diff --git a/src/gallium/drivers/nv50/nv50_draw.c
b/src/gallium/drivers/nv50/nv50_draw.c
index 2f6f607..b1b25d5 100644
--- a/src/gallium/drivers/nv50/nv50_draw.c
+++ b/src/gallium/drivers/nv50/nv50_draw.c
@@ -21,6 +21,7 @@
*/
#include "draw/draw_pipe.h"
+#include "util/u_memory.h"
#include "nv50_context.h"
diff --git a/src/gallium/drivers/nv50/nv50_miptree.c
b/src/gallium/drivers/nv50/nv50_miptree.c
index b7cd921..f2a0d15 100644
--- a/src/gallium/drivers/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
@@ -24,6 +24,7 @@
#include "pipe/p_defines.h"
#include "util/u_inlines.h"
#include "util/u_format.h"
+#include "util/u_memory.h"
#include "nv50_context.h"
#include "nv50_resource.h"
diff --git a/src/gallium/drivers/nv50/nv50_program.c
b/src/gallium/drivers/nv50/nv50_program.c
index 97f938e..00b4c8d 100644
--- a/src/gallium/drivers/nv50/nv50_program.c
+++ b/src/gallium/drivers/nv50/nv50_program.c
@@ -24,6 +24,7 @@
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
#include "util/u_inlines.h"
+#include "util/u_memory.h"
#include "pipe/p_shader_tokens.h"
#include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/nv50/nv50_query.c
b/src/gallium/drivers/nv50/nv50_query.c
index 57b16a3..635cd80 100644
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -22,6 +22,7 @@
#include "pipe/p_context.h"
#include "util/u_inlines.h"
+#include "util/u_memory.h"
#include "nv50_context.h"
diff --git a/src/gallium/drivers/nv50/nv50_screen.c
b/src/gallium/drivers/nv50/nv50_screen.c
index 21908bc..a384dd8 100644
--- a/src/gallium/drivers/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nv50/nv50_screen.c
@@ -21,6 +21,7 @@
*/
#include "util/u_format_s3tc.h"
+#include "util/u_memory.h"
#include "pipe/p_screen.h"
#include "nv50_context.h"
diff --git a/src/gallium/drivers/nv50/nv50_state.c
b/src/gallium/drivers/nv50/nv50_state.c
index f8bff76..aa23e19 100644
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -23,6 +23,7 @@
#include "pipe/p_state.h"
#include "pipe/p_defines.h"
#include "util/u_inlines.h"
+#include "util/u_memory.h"
#include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/nv50/nv50_transfer.c
b/src/gallium/drivers/nv50/nv50_transfer.c
index f973cf2..c0ef2c3 100644
--- a/src/gallium/drivers/nv50/nv50_transfer.c
+++ b/src/gallium/drivers/nv50/nv50_transfer.c
@@ -3,6 +3,7 @@
#include "util/u_inlines.h"
#include "util/u_format.h"
#include "util/u_math.h"
+#include "util/u_memory.h"
#include "nv50_context.h"
#include "nv50_transfer.h"
diff --git a/src/gallium/drivers/nvfx/nvfx_context.c
b/src/gallium/drivers/nvfx/nvfx_context.c
index 6d2dc4d..b3462d5 100644
--- a/src/gallium/drivers/nvfx/nvfx_context.c
+++ b/src/gallium/drivers/nvfx/nvfx_context.c
@@ -1,5 +1,6 @@
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
+#include "util/u_memory.h"
#include "nvfx_context.h"
#include "nvfx_screen.h"
diff --git a/src/gallium/drivers/nvfx/nvfx_draw.c
b/src/gallium/drivers/nvfx/nvfx_draw.c
index 22cff37..7805cce 100644
--- a/src/gallium/drivers/nvfx/nvfx_draw.c
+++ b/src/gallium/drivers/nvfx/nvfx_draw.c
@@ -2,6 +2,7 @@
#include "util/u_inlines.h"
#include "tgsi/tgsi_ureg.h"
+#include "util/u_memory.h"
#include "util/u_pack_color.h"
#include "draw/draw_context.h"
diff --git a/src/gallium/drivers/nvfx/nvfx_fragprog.c
b/src/gallium/drivers/nvfx/nvfx_fragprog.c
index 6772d9b..b0b9388 100644
--- a/src/gallium/drivers/nvfx/nvfx_fragprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_fragprog.c
@@ -2,6 +2,7 @@
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
#include "util/u_inlines.h"
+#include "util/u_memory.h"
#include "pipe/p_shader_tokens.h"
#include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/nvfx/nvfx_miptree.c
b/src/gallium/drivers/nvfx/nvfx_miptree.c
index b5639bb..3265469 100644
--- a/src/gallium/drivers/nvfx/nvfx_miptree.c
+++ b/src/gallium/drivers/nvfx/nvfx_miptree.c
@@ -3,6 +3,7 @@
#include "util/u_inlines.h"
#include "util/u_format.h"
#include "util/u_math.h"
+#include "util/u_memory.h"
#include "nvfx_context.h"
#include "nvfx_resource.h"
diff --git a/src/gallium/drivers/nvfx/nvfx_query.c
b/src/gallium/drivers/nvfx/nvfx_query.c
index 1b20b52..d65427d 100644
--- a/src/gallium/drivers/nvfx/nvfx_query.c
+++ b/src/gallium/drivers/nvfx/nvfx_query.c
@@ -1,4 +1,5 @@
#include "pipe/p_context.h"
+#include "util/u_memory.h"
#include "nvfx_context.h"
diff --git a/src/gallium/drivers/nvfx/nvfx_screen.c
b/src/gallium/drivers/nvfx/nvfx_screen.c
index a78d241..666f85b 100644
--- a/src/gallium/drivers/nvfx/nvfx_screen.c
+++ b/src/gallium/drivers/nvfx/nvfx_screen.c
@@ -1,6 +1,7 @@
#include "pipe/p_screen.h"
#include "pipe/p_state.h"
#include "util/u_format_s3tc.h"
+#include "util/u_memory.h"
#include "util/u_simple_screen.h"
#include "nouveau/nouveau_screen.h"
diff --git a/src/gallium/drivers/nvfx/nvfx_state.c
b/src/gallium/drivers/nvfx/nvfx_state.c
index 30322d4..f0bce05 100644
--- a/src/gallium/drivers/nvfx/nvfx_state.c
+++ b/src/gallium/drivers/nvfx/nvfx_state.c
@@ -1,6 +1,7 @@
#include "pipe/p_state.h"
#include "pipe/p_defines.h"
#include "util/u_inlines.h"
+#include "util/u_memory.h"
#include "draw/draw_context.h"
diff --git a/src/gallium/drivers/nvfx/nvfx_vertprog.c
b/src/gallium/drivers/nvfx/nvfx_vertprog.c
index 80b98b6..a64cb4f 100644
--- a/src/gallium/drivers/nvfx/nvfx_vertprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_vertprog.c
@@ -2,6 +2,7 @@
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
#include "util/u_inlines.h"
+#include "util/u_memory.h"
#include "pipe/p_shader_tokens.h"
#include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/r300/r300_flush.c
b/src/gallium/drivers/r300/r300_flush.c
index 360b19a..f9a67e9 100644
--- a/src/gallium/drivers/r300/r300_flush.c
+++ b/src/gallium/drivers/r300/r300_flush.c
@@ -24,6 +24,7 @@
#include "draw/draw_context.h"
#include "draw/draw_private.h"
+#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "r300_context.h"
diff --git a/src/gallium/drivers/r600/r600_compiler_r600.c
b/src/gallium/drivers/r600/r600_compiler_r600.c
index 14ea8ab..01235d3 100644
--- a/src/gallium/drivers/r600/r600_compiler_r600.c
+++ b/src/gallium/drivers/r600/r600_compiler_r600.c
@@ -25,7 +25,8 @@
#include <stdint.h>
#include <stdio.h>
#include <errno.h>
-#include <util/u_format.h>
+#include "util/u_format.h"
+#include "util/u_memory.h"
#include "r600_screen.h"
#include "r600_context.h"
#include "r600_sq.h"
--
1.5.4.3
More information about the mesa-dev
mailing list