util: include "util/compiler.h" instead of "pipe/p_compiler.h"

And pipe/p_compiler.h are removed as it not used any more

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23577>

diff --git a/src/gallium/README.portability b/src/gallium/README.portability
index 9fbec4c..2984ffa 100644 (file)
--- a/src/gallium/README.portability
+++ b/src/gallium/README.portability
@@ -11,7 +11,7 @@ headers in general, should strictly follow these guidelines to ensure
 
 = Compiler Support =
 
-* Include the p_compiler.h.
+* Include the util/compiler.h.
 
 * Cast explicitly when converting to integer types of smaller sizes.
 

diff --git a/src/gallium/auxiliary/cso_cache/cso_hash.h b/src/gallium/auxiliary/cso_cache/cso_hash.h
index b5722ed..a1579e7 100644 (file)
--- a/src/gallium/auxiliary/cso_cache/cso_hash.h
+++ b/src/gallium/auxiliary/cso_cache/cso_hash.h
@@ -44,7 +44,7 @@
 #ifndef CSO_HASH_H
 #define CSO_HASH_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/gallium/auxiliary/draw/draw_pipe.h b/src/gallium/auxiliary/draw/draw_pipe.h
index 2afb377..6e29856 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pipe.h
+++ b/src/gallium/auxiliary/draw/draw_pipe.h
@@ -33,7 +33,7 @@
 #ifndef DRAW_PIPE_H
 #define DRAW_PIPE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "draw_private.h"       /* for sizeof(vertex_header) */
 #include "draw_context.h"
 

diff --git a/src/gallium/auxiliary/draw/draw_pt.h b/src/gallium/auxiliary/draw/draw_pt.h
index 705a77f..57fb8ad 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pt.h
+++ b/src/gallium/auxiliary/draw/draw_pt.h
@@ -33,7 +33,7 @@
 #ifndef DRAW_PT_H
 #define DRAW_PT_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct draw_pt_middle_end;
 struct draw_context;

diff --git a/src/gallium/auxiliary/draw/draw_vbuf.h b/src/gallium/auxiliary/draw/draw_vbuf.h
index be8a5f4..55bbfe7 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_vbuf.h
+++ b/src/gallium/auxiliary/draw/draw_vbuf.h
@@ -37,7 +37,7 @@
 #define DRAW_VBUF_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 

diff --git a/src/gallium/auxiliary/draw/draw_vertex.h b/src/gallium/auxiliary/draw/draw_vertex.h
index d52a142..06a6310 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_vertex.h
+++ b/src/gallium/auxiliary/draw/draw_vertex.h
@@ -39,7 +39,7 @@
 #define DRAW_VERTEX_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_debug.h"
 #include "util/u_memory.h"

diff --git a/src/gallium/auxiliary/driver_trace/tr_context.h b/src/gallium/auxiliary/driver_trace/tr_context.h
index f687fa2..14b2b8a 100644 (file)
--- a/src/gallium/auxiliary/driver_trace/tr_context.h
+++ b/src/gallium/auxiliary/driver_trace/tr_context.h
@@ -29,7 +29,7 @@
 #define TR_CONTEXT_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/hash_table.h"
 #include "pipe/p_context.h"

diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.c b/src/gallium/auxiliary/driver_trace/tr_dump.c
index ae46ebc..3c7f045 100644 (file)
--- a/src/gallium/auxiliary/driver_trace/tr_dump.c
+++ b/src/gallium/auxiliary/driver_trace/tr_dump.c
@@ -48,7 +48,7 @@
 # include <io.h>
 #endif
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_thread.h"
 #include "util/os_time.h"
 #include "util/simple_mtx.h"

diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.h b/src/gallium/auxiliary/driver_trace/tr_dump.h
index 300d820..3486ad8 100644 (file)
--- a/src/gallium/auxiliary/driver_trace/tr_dump.h
+++ b/src/gallium/auxiliary/driver_trace/tr_dump.h
@@ -34,7 +34,7 @@
 #define TR_DUMP_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 
 struct pipe_resource;

diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_defines.h b/src/gallium/auxiliary/driver_trace/tr_dump_defines.h
index c523da2..ca3d3b9 100644 (file)
--- a/src/gallium/auxiliary/driver_trace/tr_dump_defines.h
+++ b/src/gallium/auxiliary/driver_trace/tr_dump_defines.h
@@ -28,7 +28,7 @@
 #ifndef TR_DUMP_DEFINES_H_
 #define TR_DUMP_DEFINES_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_format.h"
 #include "util/u_dump.h"
 #include "tr_dump.h"

diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_state.c b/src/gallium/auxiliary/driver_trace/tr_dump_state.c
index 5dd02c4..8561f71 100644 (file)
--- a/src/gallium/auxiliary/driver_trace/tr_dump_state.c
+++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.c
@@ -26,7 +26,7 @@
  **************************************************************************/
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_memory.h"
 #include "util/format/u_format.h"
 #include "tgsi/tgsi_dump.h"

diff --git a/src/gallium/auxiliary/driver_trace/tr_public.h b/src/gallium/auxiliary/driver_trace/tr_public.h
index 648ead1..2abfa0f 100644 (file)
--- a/src/gallium/auxiliary/driver_trace/tr_public.h
+++ b/src/gallium/auxiliary/driver_trace/tr_public.h
@@ -28,7 +28,7 @@
 #ifndef TR_PUBLIC_H
 #define TR_PUBLIC_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/gallium/auxiliary/driver_trace/tr_texture.h b/src/gallium/auxiliary/driver_trace/tr_texture.h
index b9caf96..58e5e5d 100644 (file)
--- a/src/gallium/auxiliary/driver_trace/tr_texture.h
+++ b/src/gallium/auxiliary/driver_trace/tr_texture.h
@@ -29,7 +29,7 @@
 #define TR_TEXTURE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #include "tr_screen.h"

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.h b/src/gallium/auxiliary/gallivm/lp_bld_arit.h
index df10183..b335916 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_arit.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.h
@@ -38,7 +38,7 @@
 
 
 #include "gallivm/lp_bld.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 
 struct lp_type;

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_const.h b/src/gallium/auxiliary/gallivm/lp_bld_const.h
index fe3d906..ebd6d94 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_const.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_const.h
@@ -37,7 +37,7 @@
 #define LP_BLD_CONST_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "gallivm/lp_bld.h"
 #include "gallivm/lp_bld_init.h"
 

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_coro.h b/src/gallium/auxiliary/gallivm/lp_bld_coro.h
index e3cf415..2fbaecc 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_coro.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_coro.h
@@ -27,7 +27,7 @@
 #define LP_BLD_CORO_H
 
 #include <stdbool.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "gallivm/lp_bld.h"
 #include "gallivm/lp_bld_intr.h"
 

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.h b/src/gallium/auxiliary/gallivm/lp_bld_debug.h
index 2680456..a8db59b 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.h
@@ -32,7 +32,7 @@
 
 #include "gallivm/lp_bld.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_string.h"
 
 

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
index 4d18786..cd2108f 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
@@ -27,7 +27,7 @@
 
 
 #include "util/detect.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/macros.h"
 #include "util/u_cpu_detect.h"
 #include "util/u_debug.h"

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.h b/src/gallium/auxiliary/gallivm/lp_bld_init.h
index ffed2a9..0a5c85d 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.h
@@ -30,7 +30,7 @@
 #define LP_BLD_INIT_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_pointer.h" // for func_pointer
 #include "lp_bld.h"
 #include <llvm-c/ExecutionEngine.h>

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c b/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c
index 6444514..1bd59c3 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c
@@ -21,7 +21,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "gallivm/lp_bld.h"
 #include "gallivm/lp_bld_init.h"
 #include "gallivm/lp_bld_struct.h"

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_pack.h b/src/gallium/auxiliary/gallivm/lp_bld_pack.h
index 62c8e7a..deee1c4 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_pack.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_pack.h
@@ -37,7 +37,7 @@
 #define LP_BLD_PACK_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "gallivm/lp_bld.h"
 

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_printf.h b/src/gallium/auxiliary/gallivm/lp_bld_printf.h
index e019126..1973ef6 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_printf.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_printf.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "lp_bld.h"
 #include "lp_bld_init.h"
 

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
index 9a9fe5f..e183cec 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
@@ -43,7 +43,7 @@
 #include "gallivm/lp_bld_sample.h"
 #include "gallivm/lp_bld_ir_common.h"
 #include "lp_bld_type.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "tgsi/tgsi_exec.h"
 #include "tgsi/tgsi_scan.h"

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.h b/src/gallium/auxiliary/gallivm/lp_bld_type.h
index f828ff1..f9c48fd 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_type.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.h
@@ -38,7 +38,7 @@
 
 
 #include "util/format/u_format.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "gallivm/lp_bld.h"
 
 #ifdef __cplusplus

diff --git a/src/gallium/auxiliary/hud/font.c b/src/gallium/auxiliary/hud/font.c
index b4430e2..95512a2 100644 (file)
--- a/src/gallium/auxiliary/hud/font.c
+++ b/src/gallium/auxiliary/hud/font.c
@@ -52,7 +52,7 @@
 
 #include "hud/font.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"

diff --git a/src/gallium/auxiliary/hud/font.h b/src/gallium/auxiliary/hud/font.h
index 01cdeba..daae101 100644 (file)
--- a/src/gallium/auxiliary/hud/font.h
+++ b/src/gallium/auxiliary/hud/font.h
@@ -28,7 +28,7 @@
 #ifndef FONT_H
 #define FONT_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct pipe_resource;
 struct pipe_context;

diff --git a/src/gallium/auxiliary/indices/u_indices.h b/src/gallium/auxiliary/indices/u_indices.h
index 8708403..eb38286 100644 (file)
--- a/src/gallium/auxiliary/indices/u_indices.h
+++ b/src/gallium/auxiliary/indices/u_indices.h
@@ -25,7 +25,7 @@
 #ifndef U_INDICES_H
 #define U_INDICES_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 /* First/last provoking vertex */

diff --git a/src/gallium/auxiliary/indices/u_indices_priv.h b/src/gallium/auxiliary/indices/u_indices_priv.h
index 2ad2d71..e3730b6 100644 (file)
--- a/src/gallium/auxiliary/indices/u_indices_priv.h
+++ b/src/gallium/auxiliary/indices/u_indices_priv.h
@@ -25,7 +25,7 @@
 #ifndef U_INDICES_PRIV_H
 #define U_INDICES_PRIV_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "u_indices.h"
 
 #define IN_UINT8      0

diff --git a/src/gallium/auxiliary/indices/u_unfilled_gen.py b/src/gallium/auxiliary/indices/u_unfilled_gen.py
index d6eddaf..95cd7a5 100644 (file)
--- a/src/gallium/auxiliary/indices/u_unfilled_gen.py
+++ b/src/gallium/auxiliary/indices/u_unfilled_gen.py
@@ -67,7 +67,7 @@ def prolog(f: 'T.TextIO'):
 
 #include "indices/u_indices.h"
 #include "indices/u_indices_priv.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
index b799fab..eb3c691 100644 (file)
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
@@ -33,7 +33,7 @@
 #ifndef PIPE_LOADER_H
 #define PIPE_LOADER_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "frontend/drm_driver.h"
 #include "util/xmlconfig.h"
 

diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer.h b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
index 15aa495..4955846 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
@@ -44,7 +44,7 @@
 #define PB_BUFFER_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_inlines.h"
 #include "pipe/p_defines.h"

diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index 7926d3f..8e8c861 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
@@ -42,7 +42,7 @@
 #endif
 #include <inttypes.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
index 2b8f4b2..040f1c5 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
@@ -34,7 +34,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"
 #include "util/u_memory.h"

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
index f111bda..61b80f5 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"
 #include "util/u_math.h"

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
index f078ff0..9f38de5 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
@@ -36,7 +36,7 @@
  * @author Jose Fonseca <jfonseca@vmware.com>
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"
 #include "pipe/p_defines.h"

diff --git a/src/gallium/auxiliary/pipebuffer/pb_validate.c b/src/gallium/auxiliary/pipebuffer/pb_validate.c
index 5adc331..64663f6 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_validate.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_validate.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
 #include "util/u_debug.h"

diff --git a/src/gallium/auxiliary/pipebuffer/pb_validate.h b/src/gallium/auxiliary/pipebuffer/pb_validate.h
index bdaee4f..bdc5f93 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_validate.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_validate.h
@@ -36,7 +36,7 @@
 #define PB_VALIDATE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 #ifdef __cplusplus

diff --git a/src/gallium/auxiliary/postprocess/pp_init.c b/src/gallium/auxiliary/postprocess/pp_init.c
index aecc58c..09ad74c 100644 (file)
--- a/src/gallium/auxiliary/postprocess/pp_init.c
+++ b/src/gallium/auxiliary/postprocess/pp_init.c
@@ -25,7 +25,7 @@
  *
  **************************************************************************/
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "postprocess/filters.h"
 #include "postprocess/pp_private.h"

diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.c b/src/gallium/auxiliary/postprocess/pp_mlaa.c
index 4650e6e..8b13efe 100644 (file)
--- a/src/gallium/auxiliary/postprocess/pp_mlaa.c
+++ b/src/gallium/auxiliary/postprocess/pp_mlaa.c
@@ -38,7 +38,7 @@
  * policies, either expressed or implied, of the copyright holders.
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "postprocess/postprocess.h"
 #include "postprocess/pp_mlaa.h"

diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/src/gallium/auxiliary/rtasm/rtasm_execmem.c
index ff6705d..90db1fe 100644 (file)
--- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c
@@ -31,7 +31,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/simple_mtx.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"

diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.h b/src/gallium/auxiliary/rtasm/rtasm_execmem.h
index c2cded5..43c5b90 100644 (file)
--- a/src/gallium/auxiliary/rtasm/rtasm_execmem.h
+++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.h
@@ -32,7 +32,7 @@
 #ifndef _RTASM_EXECMEM_H_
 #define _RTASM_EXECMEM_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 
 extern void *

diff --git a/src/gallium/auxiliary/rtasm/rtasm_x86sse.c b/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
index 4429a01..8f27a03 100644 (file)
--- a/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
@@ -27,7 +27,7 @@
 
 #if DETECT_ARCH_X86 || DETECT_ARCH_X86_64
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_pointer.h"
 

diff --git a/src/gallium/auxiliary/rtasm/rtasm_x86sse.h b/src/gallium/auxiliary/rtasm/rtasm_x86sse.h
index ecf855e..d09397f 100644 (file)
--- a/src/gallium/auxiliary/rtasm/rtasm_x86sse.h
+++ b/src/gallium/auxiliary/rtasm/rtasm_x86sse.h
@@ -25,7 +25,7 @@
 #ifndef _RTASM_X86SSE_H_
 #define _RTASM_X86SSE_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/detect.h"
 
 #if DETECT_ARCH_X86 || DETECT_ARCH_X86_64

diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
index cce7faa..f2cfeb3 100644 (file)
--- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
@@ -2,7 +2,7 @@
 #ifndef INLINE_DEBUG_HELPER_H
 #define INLINE_DEBUG_HELPER_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_tests.h"
 

diff --git a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
index 494dece..ddb67b3 100644 (file)
--- a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
@@ -2,7 +2,7 @@
 #ifndef INLINE_SW_HELPER_H
 #define INLINE_SW_HELPER_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_screen.h"
 #include "util/u_debug.h"
 #include "frontend/sw_winsys.h"

diff --git a/src/gallium/auxiliary/target-helpers/sw_helper.h b/src/gallium/auxiliary/target-helpers/sw_helper.h
index db616aa..65fadc4 100644 (file)
--- a/src/gallium/auxiliary/target-helpers/sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/sw_helper.h
@@ -2,7 +2,7 @@
 #ifndef SW_HELPER_H
 #define SW_HELPER_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "target-helpers/sw_helper_public.h"
 #include "frontend/sw_winsys.h"

diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.h b/src/gallium/auxiliary/tgsi/tgsi_dump.h
index ffec5e1..f5bc8e7 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_dump.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.h
@@ -28,7 +28,7 @@
 #ifndef TGSI_DUMP_H
 #define TGSI_DUMP_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_shader_tokens.h"
 

diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index dfdcfd3..a9a7404 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -51,7 +51,7 @@
  *   Brian Paul
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "pipe/p_shader_tokens.h"
 #include "tgsi/tgsi_dump.h"

diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.h b/src/gallium/auxiliary/tgsi/tgsi_exec.h
index ea6969b..48bfdd7 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.h
@@ -29,7 +29,7 @@
 #ifndef TGSI_EXEC_H
 #define TGSI_EXEC_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "pipe/p_shader_tokens.h"
 

diff --git a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.c b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.c
index 4716aaa..5128cd1 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.c
@@ -23,7 +23,7 @@
 
 #include "tgsi/tgsi_from_mesa.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/compiler.h"
 

diff --git a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
index c3595b9..8d07a4d 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_shader_tokens.h"
 

diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.h b/src/gallium/auxiliary/tgsi/tgsi_info.h
index 140d5bf..34e7af5 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_info.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.h
@@ -29,7 +29,7 @@
 #define TGSI_INFO_H
 
 #include "compiler/shader_enums.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "util/format/u_format.h"
 

diff --git a/src/gallium/auxiliary/tgsi/tgsi_parse.h b/src/gallium/auxiliary/tgsi/tgsi_parse.h
index f11dbbd..92d268d 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_parse.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_parse.h
@@ -28,7 +28,7 @@
 #ifndef TGSI_PARSE_H
 #define TGSI_PARSE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 
 #if defined __cplusplus

diff --git a/src/gallium/auxiliary/tgsi/tgsi_sanity.h b/src/gallium/auxiliary/tgsi/tgsi_sanity.h
index 3b99351..25fbd20 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_sanity.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_sanity.h
@@ -28,7 +28,7 @@
 #ifndef TGSI_SANITY_H
 #define TGSI_SANITY_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #if defined __cplusplus
 extern "C" {

diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index 3ee6349..05dbefe 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
@@ -29,7 +29,7 @@
 #define TGSI_SCAN_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "pipe/p_shader_tokens.h"
 

diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c b/src/gallium/auxiliary/tgsi/tgsi_strings.c
index 2403a4d..1e21c55 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_strings.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_strings.c
@@ -27,7 +27,7 @@
  **************************************************************************/
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_memory.h"
 #include "tgsi_strings.h"
 

diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.h b/src/gallium/auxiliary/tgsi/tgsi_text.h
index f103692..3b8de2c 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_text.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_text.h
@@ -28,7 +28,7 @@
 #ifndef TGSI_TEXT_H
 #define TGSI_TEXT_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #if defined __cplusplus
 extern "C" {

diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.h b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
index befb486..76efe95 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
@@ -30,7 +30,7 @@
 
 #include "pipe/p_defines.h"
 #include "util/format/u_formats.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "util/u_debug.h"
 

diff --git a/src/gallium/auxiliary/translate/translate.h b/src/gallium/auxiliary/translate/translate.h
index 93907f9..9ee5993 100644 (file)
--- a/src/gallium/auxiliary/translate/translate.h
+++ b/src/gallium/auxiliary/translate/translate.h
@@ -40,7 +40,7 @@
 #define _TRANSLATE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 

diff --git a/src/gallium/auxiliary/translate/translate_sse.c b/src/gallium/auxiliary/translate/translate_sse.c
index 39bb84e..7c597bf 100644 (file)
--- a/src/gallium/auxiliary/translate/translate_sse.c
+++ b/src/gallium/auxiliary/translate/translate_sse.c
@@ -27,7 +27,7 @@
 
 
 #include "util/detect.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_memory.h"
 #include "util/u_cpu_detect.h"
 #include "util/u_math.h"

diff --git a/src/gallium/auxiliary/util/u_bitmask.c b/src/gallium/auxiliary/util/u_bitmask.c
index 14e6a25..f7185b4 100644 (file)
--- a/src/gallium/auxiliary/util/u_bitmask.c
+++ b/src/gallium/auxiliary/util/u_bitmask.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #include "util/u_memory.h"

diff --git a/src/gallium/auxiliary/util/u_bitmask.h b/src/gallium/auxiliary/util/u_bitmask.h
index 7dad232..845826f 100644 (file)
--- a/src/gallium/auxiliary/util/u_bitmask.h
+++ b/src/gallium/auxiliary/util/u_bitmask.h
@@ -36,7 +36,7 @@
 #define U_HANDLE_BITMASK_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 
 #ifdef __cplusplus

diff --git a/src/gallium/auxiliary/util/u_cache.c b/src/gallium/auxiliary/util/u_cache.c
index 5d4a70d..c5f35fe 100644 (file)
--- a/src/gallium/auxiliary/util/u_cache.c
+++ b/src/gallium/auxiliary/util/u_cache.c
@@ -36,7 +36,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #include "util/u_math.h"

diff --git a/src/gallium/auxiliary/util/u_cache.h b/src/gallium/auxiliary/util/u_cache.h
index be3631b..736530e 100644 (file)
--- a/src/gallium/auxiliary/util/u_cache.h
+++ b/src/gallium/auxiliary/util/u_cache.h
@@ -36,7 +36,7 @@
 #define U_CACHE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 
 #ifdef __cplusplus

diff --git a/src/gallium/auxiliary/util/u_debug_flush.c b/src/gallium/auxiliary/util/u_debug_flush.c
index 95aebbb..45cfdae 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug_flush.c
+++ b/src/gallium/auxiliary/util/u_debug_flush.c
@@ -38,7 +38,7 @@
  */
 
 #ifdef DEBUG
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/simple_mtx.h"
 #include "util/u_debug_stack.h"
 #include "util/u_debug.h"

diff --git a/src/gallium/auxiliary/util/u_debug_image.h b/src/gallium/auxiliary/util/u_debug_image.h
index 03a5e5d..25a69b3 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug_image.h
+++ b/src/gallium/auxiliary/util/u_debug_image.h
@@ -28,7 +28,7 @@
 #define U_DEBUG_IMAGE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 
 

diff --git a/src/gallium/auxiliary/util/u_draw.h b/src/gallium/auxiliary/util/u_draw.h
index b5a623e..7214ea9 100644 (file)
--- a/src/gallium/auxiliary/util/u_draw.h
+++ b/src/gallium/auxiliary/util/u_draw.h
@@ -29,7 +29,7 @@
 #define U_DRAW_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 

diff --git a/src/gallium/auxiliary/util/u_draw_quad.h b/src/gallium/auxiliary/util/u_draw_quad.h
index e5b676a..e9eb742 100644 (file)
--- a/src/gallium/auxiliary/util/u_draw_quad.h
+++ b/src/gallium/auxiliary/util/u_draw_quad.h
@@ -29,7 +29,7 @@
 #define U_DRAWQUAD_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 
 #include "util/u_draw.h"

diff --git a/src/gallium/auxiliary/util/u_dump.h b/src/gallium/auxiliary/util/u_dump.h
index 910cbbb..ae019f0 100644 (file)
--- a/src/gallium/auxiliary/util/u_dump.h
+++ b/src/gallium/auxiliary/util/u_dump.h
@@ -36,7 +36,7 @@
 #define U_DEBUG_DUMP_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #include <stdio.h>

diff --git a/src/gallium/auxiliary/util/u_dump_state.c b/src/gallium/auxiliary/util/u_dump_state.c
index 353b942..c46a2b2 100644 (file)
--- a/src/gallium/auxiliary/util/u_dump_state.c
+++ b/src/gallium/auxiliary/util/u_dump_state.c
@@ -26,7 +26,7 @@
  **************************************************************************/
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
 #include "util/format/u_format.h"

diff --git a/src/gallium/auxiliary/util/u_framebuffer.h b/src/gallium/auxiliary/util/u_framebuffer.h
index a07e5d3..73f71c8 100644 (file)
--- a/src/gallium/auxiliary/util/u_framebuffer.h
+++ b/src/gallium/auxiliary/util/u_framebuffer.h
@@ -29,7 +29,7 @@
 #define U_FRAMEBUFFER_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 

diff --git a/src/gallium/auxiliary/util/u_handle_table.c b/src/gallium/auxiliary/util/u_handle_table.c
index c6eeeef..0436f46 100644 (file)
--- a/src/gallium/auxiliary/util/u_handle_table.c
+++ b/src/gallium/auxiliary/util/u_handle_table.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #include "util/u_memory.h"

diff --git a/src/gallium/auxiliary/util/u_pack_color.h b/src/gallium/auxiliary/util/u_pack_color.h
index 1b0a6a2..7aea01d 100644 (file)
--- a/src/gallium/auxiliary/util/u_pack_color.h
+++ b/src/gallium/auxiliary/util/u_pack_color.h
@@ -35,7 +35,7 @@
 #define U_PACK_COLOR_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "util/format/u_format.h"
 #include "util/u_math.h"

diff --git a/src/gallium/auxiliary/util/u_pstipple.h b/src/gallium/auxiliary/util/u_pstipple.h
index 9f71942..9234faf 100644 (file)
--- a/src/gallium/auxiliary/util/u_pstipple.h
+++ b/src/gallium/auxiliary/util/u_pstipple.h
@@ -29,7 +29,7 @@
 #ifndef U_PSTIPPLE_H
 #define U_PSTIPPLE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/gallium/auxiliary/util/u_rect.h b/src/gallium/auxiliary/util/u_rect.h
index df6ddbc..bce396b 100644 (file)
--- a/src/gallium/auxiliary/util/u_rect.h
+++ b/src/gallium/auxiliary/util/u_rect.h
@@ -29,7 +29,7 @@
 #ifndef U_RECT_H
 #define U_RECT_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_math.h"
 
 #ifdef __cplusplus

diff --git a/src/gallium/auxiliary/util/u_simple_shaders.h b/src/gallium/auxiliary/util/u_simple_shaders.h
index daecca0..f7fac85 100644 (file)
--- a/src/gallium/auxiliary/util/u_simple_shaders.h
+++ b/src/gallium/auxiliary/util/u_simple_shaders.h
@@ -30,7 +30,7 @@
 #define U_SIMPLE_SHADERS_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 
 

diff --git a/src/gallium/auxiliary/util/u_split_prim.h b/src/gallium/auxiliary/util/u_split_prim.h
index fe048cc..09545cd 100644 (file)
--- a/src/gallium/auxiliary/util/u_split_prim.h
+++ b/src/gallium/auxiliary/util/u_split_prim.h
@@ -4,7 +4,7 @@
 #define U_SPLIT_PRIM_H
 
 #include "pipe/p_defines.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_debug.h"
 

diff --git a/src/gallium/auxiliary/util/u_sse.h b/src/gallium/auxiliary/util/u_sse.h
index 5d44547..5d1eecc 100644 (file)
--- a/src/gallium/auxiliary/util/u_sse.h
+++ b/src/gallium/auxiliary/util/u_sse.h
@@ -38,7 +38,7 @@
 #define U_SSE_H_
 
 #include "util/detect.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #if DETECT_ARCH_SSE

diff --git a/src/gallium/auxiliary/util/u_surface.h b/src/gallium/auxiliary/util/u_surface.h
index e534005..c635239 100644 (file)
--- a/src/gallium/auxiliary/util/u_surface.h
+++ b/src/gallium/auxiliary/util/u_surface.h
@@ -29,7 +29,7 @@
 #define U_SURFACE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #include "util/u_pack_color.h"

diff --git a/src/gallium/auxiliary/util/u_tests.h b/src/gallium/auxiliary/util/u_tests.h
index 5ac5d83..c26f073 100644 (file)
--- a/src/gallium/auxiliary/util/u_tests.h
+++ b/src/gallium/auxiliary/util/u_tests.h
@@ -28,7 +28,7 @@
 #ifndef U_TESTS_H
 #define U_TESTS_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/gallium/auxiliary/util/u_texture.h b/src/gallium/auxiliary/util/u_texture.h
index c1e9113..98a0890 100644 (file)
--- a/src/gallium/auxiliary/util/u_texture.h
+++ b/src/gallium/auxiliary/util/u_texture.h
@@ -27,7 +27,7 @@
 #ifndef U_TEXTURE_H
 #define U_TEXTURE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/gallium/auxiliary/util/u_tile.h b/src/gallium/auxiliary/util/u_tile.h
index e9f0ab0..119373a 100644 (file)
--- a/src/gallium/auxiliary/util/u_tile.h
+++ b/src/gallium/auxiliary/util/u_tile.h
@@ -28,7 +28,7 @@
 #ifndef P_TILE_H
 #define P_TILE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 

diff --git a/src/gallium/auxiliary/util/u_upload_mgr.h b/src/gallium/auxiliary/util/u_upload_mgr.h
index edfa0ce..3ea1822 100644 (file)
--- a/src/gallium/auxiliary/util/u_upload_mgr.h
+++ b/src/gallium/auxiliary/util/u_upload_mgr.h
@@ -32,7 +32,7 @@
 #ifndef U_UPLOAD_MGR_H
 #define U_UPLOAD_MGR_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 struct pipe_context;

diff --git a/src/gallium/auxiliary/util/u_video.h b/src/gallium/auxiliary/util/u_video.h
index ae3f024..116af07 100644 (file)
--- a/src/gallium/auxiliary/util/u_video.h
+++ b/src/gallium/auxiliary/util/u_video.h
@@ -32,7 +32,7 @@
 #include "pipe/p_video_enums.h"
 
 /* u_reduce_video_profile() needs these */
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_math.h"
 

diff --git a/src/gallium/auxiliary/vl/vl_compositor_gfx.c b/src/gallium/auxiliary/vl/vl_compositor_gfx.c
index eb33f7b..b7080c3 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_compositor_gfx.c
+++ b/src/gallium/auxiliary/vl/vl_compositor_gfx.c
@@ -27,7 +27,7 @@
 
 #include <assert.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 
 #include "util/u_memory.h"

diff --git a/src/gallium/auxiliary/vl/vl_csc.h b/src/gallium/auxiliary/vl/vl_csc.h
index 8623e1b..b640b4e 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_csc.h
+++ b/src/gallium/auxiliary/vl/vl_csc.h
@@ -28,7 +28,7 @@
 #ifndef vl_csc_h
 #define vl_csc_h
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 typedef float vl_csc_matrix[3][4];
 

diff --git a/src/gallium/auxiliary/vl/vl_zscan.h b/src/gallium/auxiliary/vl/vl_zscan.h
index 978503d..135e7c3 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_zscan.h
+++ b/src/gallium/auxiliary/vl/vl_zscan.h
@@ -28,7 +28,7 @@
 #ifndef vl_zscan_h
 #define vl_zscan_h
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #ifdef __cplusplus

diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.h b/src/gallium/drivers/etnaviv/etnaviv_compiler.h
index 08a3852..f86a08c 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.h
@@ -30,7 +30,7 @@
 #include "etnaviv_context.h"
 #include "etnaviv_internal.h"
 #include "etnaviv_shader.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "compiler/shader_enums.h"
 #include "util/disk_cache.h"

diff --git a/src/gallium/drivers/i915/i915_query.c b/src/gallium/drivers/i915/i915_query.c
index 8d4402b..4e53d0d 100644 (file)
--- a/src/gallium/drivers/i915/i915_query.c
+++ b/src/gallium/drivers/i915/i915_query.c
@@ -27,7 +27,7 @@
 
 /* Fake occlusion queries which return 0, it's better than crashing */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_memory.h"
 

diff --git a/src/gallium/drivers/i915/i915_state_inlines.h b/src/gallium/drivers/i915/i915_state_inlines.h
index 8d7885e..9c1415e 100644 (file)
--- a/src/gallium/drivers/i915/i915_state_inlines.h
+++ b/src/gallium/drivers/i915/i915_state_inlines.h
@@ -28,7 +28,7 @@
 #ifndef I915_STATE_INLINES_H
 #define I915_STATE_INLINES_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
 #include "i915_reg.h"

diff --git a/src/gallium/drivers/i915/i915_winsys.h b/src/gallium/drivers/i915/i915_winsys.h
index 7d99ce9..aaa0154 100644 (file)
--- a/src/gallium/drivers/i915/i915_winsys.h
+++ b/src/gallium/drivers/i915/i915_winsys.h
@@ -26,7 +26,7 @@
 #ifndef I915_WINSYS_H
 #define I915_WINSYS_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct i915_winsys;
 struct i915_winsys_buffer;

diff --git a/src/gallium/drivers/llvmpipe/lp_bld_alpha.h b/src/gallium/drivers/llvmpipe/lp_bld_alpha.h
index ca483ad..cf2d85b 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_bld_alpha.h
+++ b/src/gallium/drivers/llvmpipe/lp_bld_alpha.h
@@ -34,7 +34,7 @@
 #ifndef LP_BLD_ALPHA_H
 #define LP_BLD_ALPHA_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "gallivm/lp_bld.h"
 

diff --git a/src/gallium/drivers/llvmpipe/lp_bld_depth.h b/src/gallium/drivers/llvmpipe/lp_bld_depth.h
index 6cb8d69..a38dbd0 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_bld_depth.h
+++ b/src/gallium/drivers/llvmpipe/lp_bld_depth.h
@@ -36,7 +36,7 @@
 #define LP_BLD_DEPTH_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #include "gallivm/lp_bld.h"

diff --git a/src/gallium/drivers/llvmpipe/lp_cs_tpool.h b/src/gallium/drivers/llvmpipe/lp_cs_tpool.h
index 22c0d10..3d7ac02 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_cs_tpool.h
+++ b/src/gallium/drivers/llvmpipe/lp_cs_tpool.h
@@ -34,7 +34,7 @@
 #ifndef LP_CS_QUEUE
 #define LP_CS_QUEUE
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_thread.h"
 #include "util/list.h"

diff --git a/src/gallium/drivers/llvmpipe/lp_debug.h b/src/gallium/drivers/llvmpipe/lp_debug.h
index 56cb706..2212a82 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_debug.h
+++ b/src/gallium/drivers/llvmpipe/lp_debug.h
@@ -29,7 +29,7 @@
 #ifndef LP_DEBUG_H
 #define LP_DEBUG_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #define DEBUG_PIPE      0x1

diff --git a/src/gallium/drivers/llvmpipe/lp_flush.h b/src/gallium/drivers/llvmpipe/lp_flush.h
index 4d1c2df..4aad861 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_flush.h
+++ b/src/gallium/drivers/llvmpipe/lp_flush.h
@@ -28,7 +28,7 @@
 #ifndef LP_FLUSH_H
 #define LP_FLUSH_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct pipe_context;
 struct pipe_fence_handle;

diff --git a/src/gallium/drivers/llvmpipe/lp_memory.h b/src/gallium/drivers/llvmpipe/lp_memory.h
index aee3c39..00f5bea 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_memory.h
+++ b/src/gallium/drivers/llvmpipe/lp_memory.h
@@ -29,7 +29,7 @@
 #define LP_MEMORY_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "lp_limits.h"
 #include "gallivm/lp_bld_type.h"

diff --git a/src/gallium/drivers/llvmpipe/lp_perf.h b/src/gallium/drivers/llvmpipe/lp_perf.h
index 61e3fa8..6101921 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_perf.h
+++ b/src/gallium/drivers/llvmpipe/lp_perf.h
@@ -33,7 +33,7 @@
 #ifndef LP_PERF_H
 #define LP_PERF_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 /**
  * Various counters

diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h
index 13ae6ab..12f7082 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_rast.h
+++ b/src/gallium/drivers/llvmpipe/lp_rast.h
@@ -37,7 +37,7 @@
 #ifndef LP_RAST_H
 #define LP_RAST_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_pack_color.h"
 #include "util/u_rect.h"
 #include "lp_jit.h"

diff --git a/src/gallium/drivers/llvmpipe/lp_scene_queue.h b/src/gallium/drivers/llvmpipe/lp_scene_queue.h
index 1ce71c7..23e047e 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_scene_queue.h
+++ b/src/gallium/drivers/llvmpipe/lp_scene_queue.h
@@ -29,7 +29,7 @@
 #ifndef LP_SCENE_QUEUE
 #define LP_SCENE_QUEUE
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct lp_scene_queue;
 struct lp_scene;

diff --git a/src/gallium/drivers/llvmpipe/lp_setup.h b/src/gallium/drivers/llvmpipe/lp_setup.h
index 8d33004..28ae673 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_setup.h
+++ b/src/gallium/drivers/llvmpipe/lp_setup.h
@@ -27,7 +27,7 @@
 #ifndef LP_SETUP_H
 #define LP_SETUP_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "lp_jit.h"
 
 struct draw_context;

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.h b/src/gallium/drivers/llvmpipe/lp_state_fs.h
index 05febde..023b7e8 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.h
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.h
@@ -31,7 +31,7 @@
 
 
 #include "util/list.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "gallivm/lp_bld_sample.h" /* for struct lp_sampler_static_state */
 #include "gallivm/lp_bld_jit_sample.h"

diff --git a/src/gallium/drivers/nouveau/nv30/nvfx_shader.h b/src/gallium/drivers/nouveau/nv30/nvfx_shader.h
index 907ca17..e6e7051 100644 (file)
--- a/src/gallium/drivers/nouveau/nv30/nvfx_shader.h
+++ b/src/gallium/drivers/nouveau/nv30/nvfx_shader.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #define NVFX_SWZ_IDENTITY ((3 << 6) | (2 << 4) | (1 << 2) | (0 << 0))
 

diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h
index 844088c..32be6d7 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_context.h
+++ b/src/gallium/drivers/panfrost/pan_context.h
@@ -35,11 +35,11 @@
 #include "pan_resource.h"
 #include "pan_texture.h"
 
-#include "pipe/p_compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
+#include "util/compiler.h"
 #include "util/detect.h"
 #include "util/format/u_formats.h"
 #include "util/hash_table.h"

diff --git a/src/gallium/drivers/r300/r300_chipset.h b/src/gallium/drivers/r300/r300_chipset.h
index 3d16c67..4663203 100644 (file)
--- a/src/gallium/drivers/r300/r300_chipset.h
+++ b/src/gallium/drivers/r300/r300_chipset.h
@@ -23,7 +23,7 @@
 #ifndef R300_CHIPSET_H
 #define R300_CHIPSET_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 /* these are sizes in dwords */
 #define R300_HIZ_LIMIT 10240

diff --git a/src/gallium/drivers/r300/r300_screen_buffer.h b/src/gallium/drivers/r300/r300_screen_buffer.h
index da37d34..8706950 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -27,7 +27,7 @@
 #define R300_SCREEN_BUFFER_H
 
 #include <stdio.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_transfer.h"
 

diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h
index f18794b..5859ee0 100644 (file)
--- a/src/gallium/drivers/r300/r300_texture.h
+++ b/src/gallium/drivers/r300/r300_texture.h
@@ -23,7 +23,7 @@
 #ifndef R300_TEXTURE_H
 #define R300_TEXTURE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_screen.h"
 

diff --git a/src/gallium/drivers/r300/r300_tgsi_to_rc.h b/src/gallium/drivers/r300/r300_tgsi_to_rc.h
index 4dc3ddc..049cb1e 100644 (file)
--- a/src/gallium/drivers/r300/r300_tgsi_to_rc.h
+++ b/src/gallium/drivers/r300/r300_tgsi_to_rc.h
@@ -23,7 +23,7 @@
 #ifndef R300_TGSI_TO_RC_H
 #define R300_TGSI_TO_RC_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct radeon_compiler;
 

diff --git a/src/gallium/drivers/softpipe/sp_flush.h b/src/gallium/drivers/softpipe/sp_flush.h
index 0919eda..752f25e 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_flush.h
+++ b/src/gallium/drivers/softpipe/sp_flush.h
@@ -28,7 +28,7 @@
 #ifndef SP_FLUSH_H
 #define SP_FLUSH_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct pipe_context;
 struct pipe_fence_handle;

diff --git a/src/gallium/drivers/softpipe/sp_tex_tile_cache.h b/src/gallium/drivers/softpipe/sp_tex_tile_cache.h
index 2e4635f..a6bb2eb 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_tex_tile_cache.h
+++ b/src/gallium/drivers/softpipe/sp_tex_tile_cache.h
@@ -29,7 +29,7 @@
 #define SP_TEX_TILE_CACHE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "sp_limits.h"
 
 

diff --git a/src/gallium/drivers/softpipe/sp_tile_cache.h b/src/gallium/drivers/softpipe/sp_tile_cache.h
index 0d6d93d..dbb46d3 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_tile_cache.h
+++ b/src/gallium/drivers/softpipe/sp_tile_cache.h
@@ -29,7 +29,7 @@
 #define SP_TILE_CACHE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "sp_texture.h"
 
 

diff --git a/src/gallium/drivers/svga/include/svga_types.h b/src/gallium/drivers/svga/include/svga_types.h
index 611e8de..1782d98 100644 (file)
--- a/src/gallium/drivers/svga/include/svga_types.h
+++ b/src/gallium/drivers/svga/include/svga_types.h
@@ -26,7 +26,7 @@
 #ifndef _SVGA_TYPES_H_
 #define _SVGA_TYPES_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifndef __HAIKU__
 typedef int64_t int64;

diff --git a/src/gallium/drivers/svga/svga_debug.h b/src/gallium/drivers/svga/svga_debug.h
index 8b43279..7ce69de 100644 (file)
--- a/src/gallium/drivers/svga/svga_debug.h
+++ b/src/gallium/drivers/svga/svga_debug.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_DEBUG_H
 #define SVGA_DEBUG_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #define DEBUG_DMA          0x1

diff --git a/src/gallium/drivers/svga/svga_draw.c b/src/gallium/drivers/svga/svga_draw.c
index 91ac04f..00c8a8c 100644 (file)
--- a/src/gallium/drivers/svga/svga_draw.c
+++ b/src/gallium/drivers/svga/svga_draw.c
@@ -23,7 +23,7 @@
  *
  **********************************************************/
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_inlines.h"
 #include "pipe/p_defines.h"
 #include "util/u_helpers.h"

diff --git a/src/gallium/drivers/svga/svga_draw.h b/src/gallium/drivers/svga/svga_draw.h
index 345539a..a97a295 100644 (file)
--- a/src/gallium/drivers/svga/svga_draw.h
+++ b/src/gallium/drivers/svga/svga_draw.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_DRAW_H
 #define SVGA_DRAW_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "svga_hw_reg.h"
 

diff --git a/src/gallium/drivers/svga/svga_draw_private.h b/src/gallium/drivers/svga/svga_draw_private.h
index 329f539..7194048 100644 (file)
--- a/src/gallium/drivers/svga/svga_draw_private.h
+++ b/src/gallium/drivers/svga/svga_draw_private.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_DRAW_H_
 #define SVGA_DRAW_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "indices/u_indices.h"
 #include "util/u_prim.h"

diff --git a/src/gallium/drivers/svga/svga_hw_reg.h b/src/gallium/drivers/svga/svga_hw_reg.h
index 91e50e4..b3653ef 100644 (file)
--- a/src/gallium/drivers/svga/svga_hw_reg.h
+++ b/src/gallium/drivers/svga/svga_hw_reg.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_HW_REG_H
 #define SVGA_HW_REG_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "svga_types.h"
 

diff --git a/src/gallium/drivers/svga/svga_resource_buffer.h b/src/gallium/drivers/svga/svga_resource_buffer.h
index 8eee894..ddde586 100644 (file)
--- a/src/gallium/drivers/svga/svga_resource_buffer.h
+++ b/src/gallium/drivers/svga/svga_resource_buffer.h
@@ -27,7 +27,7 @@
 #define SVGA_BUFFER_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_transfer.h"
 

diff --git a/src/gallium/drivers/svga/svga_resource_texture.h b/src/gallium/drivers/svga/svga_resource_texture.h
index bad5c18..118b5c4 100644 (file)
--- a/src/gallium/drivers/svga/svga_resource_texture.h
+++ b/src/gallium/drivers/svga/svga_resource_texture.h
@@ -27,7 +27,7 @@
 #define SVGA_TEXTURE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"

diff --git a/src/gallium/drivers/svga/svga_sampler_view.h b/src/gallium/drivers/svga/svga_sampler_view.h
index 8adae9a..d2ddde0 100644 (file)
--- a/src/gallium/drivers/svga/svga_sampler_view.h
+++ b/src/gallium/drivers/svga/svga_sampler_view.h
@@ -27,7 +27,7 @@
 #define SVGA_SAMPLER_VIEW_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
 #include "svga_screen_cache.h"

diff --git a/src/gallium/drivers/svga/svga_state.h b/src/gallium/drivers/svga/svga_state.h
index 4fc4519..6a871f7 100644 (file)
--- a/src/gallium/drivers/svga/svga_state.h
+++ b/src/gallium/drivers/svga/svga_state.h
@@ -27,7 +27,7 @@
 #define SVGA_STATE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 struct svga_context;

diff --git a/src/gallium/drivers/svga/svga_surface.h b/src/gallium/drivers/svga/svga_surface.h
index e97a392..b2745f4 100644 (file)
--- a/src/gallium/drivers/svga/svga_surface.h
+++ b/src/gallium/drivers/svga/svga_surface.h
@@ -27,7 +27,7 @@
 #define SVGA_SURFACE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
 #include "svga_screen_cache.h"

diff --git a/src/gallium/drivers/svga/svga_swtnl.h b/src/gallium/drivers/svga/svga_swtnl.h
index 0258993..baa627c 100644 (file)
--- a/src/gallium/drivers/svga/svga_swtnl.h
+++ b/src/gallium/drivers/svga/svga_swtnl.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_SWTNL_H
 #define SVGA_SWTNL_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct svga_context;
 struct pipe_context;

diff --git a/src/gallium/drivers/svga/svga_tgsi.c b/src/gallium/drivers/svga/svga_tgsi.c
index b6a1adc..3a4a1ac 100644 (file)
--- a/src/gallium/drivers/svga/svga_tgsi.c
+++ b/src/gallium/drivers/svga/svga_tgsi.c
@@ -24,7 +24,7 @@
  **********************************************************/
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "pipe/p_defines.h"
 #include "tgsi/tgsi_dump.h"

diff --git a/src/gallium/drivers/svga/svga_tgsi.h b/src/gallium/drivers/svga/svga_tgsi.h
index 4519123..8009b29 100644 (file)
--- a/src/gallium/drivers/svga/svga_tgsi.h
+++ b/src/gallium/drivers/svga/svga_tgsi.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_TGSI_H
 #define SVGA_TGSI_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "svga3d_reg.h"
 
 

diff --git a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
index 5cb65d3..171e8fc 100644 (file)
--- a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
+++ b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
@@ -32,7 +32,7 @@
  * \author Brian Paul
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "pipe/p_defines.h"
 #include "tgsi/tgsi_dump.h"

diff --git a/src/gallium/drivers/svga/svga_winsys.h b/src/gallium/drivers/svga/svga_winsys.h
index 630cb20..4c4ae8f 100644 (file)
--- a/src/gallium/drivers/svga/svga_winsys.h
+++ b/src/gallium/drivers/svga/svga_winsys.h
@@ -40,7 +40,7 @@
 #include "svga_reg.h"
 #include "svga3d_reg.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 #include "svga_mksstats.h"

diff --git a/src/gallium/drivers/svga/svgadump/svga_dump.h b/src/gallium/drivers/svga/svgadump/svga_dump.h
index ca01543..f6f971c 100644 (file)
--- a/src/gallium/drivers/svga/svgadump/svga_dump.h
+++ b/src/gallium/drivers/svga/svgadump/svga_dump.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_DUMP_H_
 #define SVGA_DUMP_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 void            
 svga_dump_command(uint32_t cmd_id, const void *data, uint32_t size);

diff --git a/src/gallium/drivers/svga/svgadump/svga_shader.h b/src/gallium/drivers/svga/svgadump/svga_shader.h
index 0a2e3d5..41a40d4 100644 (file)
--- a/src/gallium/drivers/svga/svgadump/svga_shader.h
+++ b/src/gallium/drivers/svga/svgadump/svga_shader.h
@@ -33,7 +33,7 @@
 #ifndef ST_SHADER_SVGA_H
 #define ST_SHADER_SVGA_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct sh_op
 {

diff --git a/src/gallium/frontends/dri/dri_context.h b/src/gallium/frontends/dri/dri_context.h
index 60bf864..e008ed3 100644 (file)
--- a/src/gallium/frontends/dri/dri_context.h
+++ b/src/gallium/frontends/dri/dri_context.h
@@ -33,7 +33,7 @@
 #define DRI_CONTEXT_H
 
 #include "dri_util.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "hud/hud_context.h"
 
 struct pipe_context;

diff --git a/src/gallium/frontends/dri/dri_drawable.h b/src/gallium/frontends/dri/dri_drawable.h
index dc7e5e3..eaa7c35 100644 (file)
--- a/src/gallium/frontends/dri/dri_drawable.h
+++ b/src/gallium/frontends/dri/dri_drawable.h
@@ -28,7 +28,7 @@
 #ifndef DRI_DRAWABLE_H
 #define DRI_DRAWABLE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "frontend/api.h"
 #include "dri_util.h"

diff --git a/src/gallium/frontends/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h
index 24ddbf4..b35d623 100644 (file)
--- a/src/gallium/frontends/dri/dri_screen.h
+++ b/src/gallium/frontends/dri/dri_screen.h
@@ -34,7 +34,7 @@
 
 #include "dri_util.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "frontend/api.h"

diff --git a/src/gallium/frontends/glx/xlib/glx_api.c b/src/gallium/frontends/glx/xlib/glx_api.c
index dd10b52..28022c8 100644 (file)
--- a/src/gallium/frontends/glx/xlib/glx_api.c
+++ b/src/gallium/frontends/glx/xlib/glx_api.c
@@ -41,7 +41,7 @@
 #include "xm_api.h"
 #include "main/errors.h"
 #include "main/config.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 

diff --git a/src/gallium/frontends/glx/xlib/glx_getproc.c b/src/gallium/frontends/glx/xlib/glx_getproc.c
index 5fe0fe2..bfc52f0 100644 (file)
--- a/src/gallium/frontends/glx/xlib/glx_getproc.c
+++ b/src/gallium/frontends/glx/xlib/glx_getproc.c
@@ -32,7 +32,7 @@
 #define GLX_GLXEXT_PROTOTYPES
 
 #include <string.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "GL/glx.h"
 #include "glapi/glapi.h"
 

diff --git a/src/gallium/frontends/glx/xlib/xm_st.h b/src/gallium/frontends/glx/xlib/xm_st.h
index d6817f5..1150fe8 100644 (file)
--- a/src/gallium/frontends/glx/xlib/xm_st.h
+++ b/src/gallium/frontends/glx/xlib/xm_st.h
@@ -28,7 +28,7 @@
 #ifndef _XM_ST_H_
 #define _XM_ST_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "frontend/api.h"
 
 #include "xm_api.h"

diff --git a/src/gallium/frontends/hgl/hgl_context.h b/src/gallium/frontends/hgl/hgl_context.h
index 03e567a..f5d44ed 100644 (file)
--- a/src/gallium/frontends/hgl/hgl_context.h
+++ b/src/gallium/frontends/hgl/hgl_context.h
@@ -10,7 +10,7 @@
 
 #include "util/u_thread.h"
 #include "util/format/u_formats.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_screen.h"
 #include "postprocess/filters.h"
 

diff --git a/src/gallium/frontends/nine/guid.h b/src/gallium/frontends/nine/guid.h
index ed61698..be1b34a 100644 (file)
--- a/src/gallium/frontends/nine/guid.h
+++ b/src/gallium/frontends/nine/guid.h
@@ -23,7 +23,7 @@
 #ifndef _NINE_GUID_H_
 #define _NINE_GUID_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "d3d9types.h"
 

diff --git a/src/gallium/frontends/nine/iunknown.h b/src/gallium/frontends/nine/iunknown.h
index 98e63e8..cdf27fa 100644 (file)
--- a/src/gallium/frontends/nine/iunknown.h
+++ b/src/gallium/frontends/nine/iunknown.h
@@ -23,7 +23,7 @@
 #ifndef _NINE_IUNKNOWN_H_
 #define _NINE_IUNKNOWN_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_atomic.h"
 #include "util/u_memory.h"

diff --git a/src/gallium/frontends/nine/nine_debug.h b/src/gallium/frontends/nine/nine_debug.h
index 6f7652e..a4b0363 100644 (file)
--- a/src/gallium/frontends/nine/nine_debug.h
+++ b/src/gallium/frontends/nine/nine_debug.h
@@ -24,7 +24,7 @@
 #define _NINE_DEBUG_H_
 
 #include "util/u_debug.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 void
 _nine_debug_printf( unsigned long flag,

diff --git a/src/gallium/frontends/nine/nine_flags.h b/src/gallium/frontends/nine/nine_flags.h
index 3b81a09..cf689c7 100644 (file)
--- a/src/gallium/frontends/nine/nine_flags.h
+++ b/src/gallium/frontends/nine/nine_flags.h
@@ -3,7 +3,7 @@
 #ifndef _NINE_FLAGS_H_
 #define _NINE_FLAGS_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 /* Incoming 32 bits calls are 4-byte aligned.
  * We need to realign them to be able to use
@@ -11,4 +11,4 @@
  */
 #define NINE_WINAPI WINAPI UTIL_ALIGN_STACK
 
-#endif /* _NINE_FLAGS_H_ */
\ No newline at end of file
+#endif /* _NINE_FLAGS_H_ */

diff --git a/src/gallium/frontends/nine/nine_queue.h b/src/gallium/frontends/nine/nine_queue.h
index 52f6cbd..8d298d8 100644 (file)
--- a/src/gallium/frontends/nine/nine_queue.h
+++ b/src/gallium/frontends/nine/nine_queue.h
@@ -23,7 +23,7 @@
 #ifndef _NINE_QUEUE_H_
 #define _NINE_QUEUE_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct nine_queue_pool;
 

diff --git a/src/gallium/frontends/nine/nine_quirk.h b/src/gallium/frontends/nine/nine_quirk.h
index f1587fe..977d8f9 100644 (file)
--- a/src/gallium/frontends/nine/nine_quirk.h
+++ b/src/gallium/frontends/nine/nine_quirk.h
@@ -23,7 +23,7 @@
 #ifndef _NINE_QUIRK_H_
 #define _NINE_QUIRK_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 bool
 _nine_get_quirk( unsigned quirk );

diff --git a/src/gallium/frontends/vdpau/device.c b/src/gallium/frontends/vdpau/device.c
index baffa5d..a8681d2 100644 (file)
--- a/src/gallium/frontends/vdpau/device.c
+++ b/src/gallium/frontends/vdpau/device.c
@@ -25,7 +25,7 @@
  *
  **************************************************************************/
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_memory.h"
 #include "util/u_debug.h"

diff --git a/src/gallium/frontends/vdpau/vdpau_private.h b/src/gallium/frontends/vdpau/vdpau_private.h
index 5bbb63b..22538ee 100644 (file)
--- a/src/gallium/frontends/vdpau/vdpau_private.h
+++ b/src/gallium/frontends/vdpau/vdpau_private.h
@@ -33,7 +33,7 @@
 #include <vdpau/vdpau.h>
 #include <vdpau/vdpau_x11.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_video_codec.h"
 
 #include "frontend/vdpau_interop.h"

diff --git a/src/gallium/frontends/wgl/stw_context.c b/src/gallium/frontends/wgl/stw_context.c
index 48ee6ba..946dbc4 100644 (file)
--- a/src/gallium/frontends/wgl/stw_context.c
+++ b/src/gallium/frontends/wgl/stw_context.c
@@ -34,7 +34,7 @@
 #include <GL/gl.h>
 #include <GL/wglext.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "util/compiler.h"

diff --git a/src/gallium/frontends/wgl/stw_device.h b/src/gallium/frontends/wgl/stw_device.h
index 385f9c3..7f70aed 100644 (file)
--- a/src/gallium/frontends/wgl/stw_device.h
+++ b/src/gallium/frontends/wgl/stw_device.h
@@ -29,7 +29,7 @@
 #define STW_DEVICE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "frontend/api.h"
 #include "util/u_handle_table.h"
 #include "util/u_dynarray.h"

diff --git a/src/gallium/frontends/wgl/stw_ext_pixelformat.c b/src/gallium/frontends/wgl/stw_ext_pixelformat.c
index fb8facb..e4c6953 100644 (file)
--- a/src/gallium/frontends/wgl/stw_ext_pixelformat.c
+++ b/src/gallium/frontends/wgl/stw_ext_pixelformat.c
@@ -41,7 +41,7 @@
 #include <GL/gl.h>
 #include <GL/wglext.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_format.h"
 #include "util/u_memory.h"
 #include "stw_device.h"

diff --git a/src/gallium/frontends/wgl/stw_pixelformat.h b/src/gallium/frontends/wgl/stw_pixelformat.h
index a53a6b6..e76b608 100644 (file)
--- a/src/gallium/frontends/wgl/stw_pixelformat.h
+++ b/src/gallium/frontends/wgl/stw_pixelformat.h
@@ -34,7 +34,7 @@
 #define PFD_SUPPORT_COMPOSITION 0x00008000
 #endif
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "frontend/api.h"
 

diff --git a/src/gallium/frontends/wgl/stw_tls.c b/src/gallium/frontends/wgl/stw_tls.c
index e1d00df..3bded9d 100644 (file)
--- a/src/gallium/frontends/wgl/stw_tls.c
+++ b/src/gallium/frontends/wgl/stw_tls.c
@@ -28,7 +28,7 @@
 #include <windows.h>
 #include <tlhelp32.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "stw_tls.h"
 

diff --git a/src/gallium/frontends/wgl/stw_winsys.h b/src/gallium/frontends/wgl/stw_winsys.h
index 1e84675..ebf2a3a 100644 (file)
--- a/src/gallium/frontends/wgl/stw_winsys.h
+++ b/src/gallium/frontends/wgl/stw_winsys.h
@@ -30,7 +30,7 @@
 
 #include <windows.h> /* for HDC */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "frontend/api.h"
 
 struct pipe_screen;

diff --git a/src/gallium/include/frontend/drisw_api.h b/src/gallium/include/frontend/drisw_api.h
index 4b5d36c..037f4b6 100644 (file)
--- a/src/gallium/include/frontend/drisw_api.h
+++ b/src/gallium/include/frontend/drisw_api.h
@@ -1,7 +1,7 @@
 #ifndef _DRISW_API_H_
 #define _DRISW_API_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "sw_winsys.h"
 
 struct pipe_screen;

diff --git a/src/gallium/include/frontend/drm_driver.h b/src/gallium/include/frontend/drm_driver.h
index f182412..50f47b7 100644 (file)
--- a/src/gallium/include/frontend/drm_driver.h
+++ b/src/gallium/include/frontend/drm_driver.h
@@ -2,7 +2,7 @@
 #ifndef _DRM_DRIVER_H_
 #define _DRM_DRIVER_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "winsys_handle.h"
 

diff --git a/src/gallium/include/frontend/sw_driver.h b/src/gallium/include/frontend/sw_driver.h
index 6223ff9..161e05e 100644 (file)
--- a/src/gallium/include/frontend/sw_driver.h
+++ b/src/gallium/include/frontend/sw_driver.h
@@ -2,7 +2,7 @@
 #ifndef _SW_DRIVER_H_
 #define _SW_DRIVER_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct pipe_screen;
 struct sw_winsys;

diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
deleted file mode 100644 (file)
index 41a1d26..0000000
--- a/src/gallium/include/pipe/p_compiler.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007-2008 VMware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
-
-#ifndef P_COMPILER_H
-#define P_COMPILER_H
-
-
-#include "util/compiler.h"
-
-#endif /* P_COMPILER_H */

diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index d6a8855..590a00b 100644 (file)
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -28,7 +28,7 @@
 #ifndef PIPE_CONTEXT_H
 #define PIPE_CONTEXT_H
 
-#include "p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "p_video_enums.h"
 #include "p_defines.h"

diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index c3222f9..a96b040 100644 (file)
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -28,7 +28,7 @@
 #ifndef PIPE_DEFINES_H
 #define PIPE_DEFINES_H
 
-#include "p_compiler.h"
+#include "util/compiler.h"
 
 #include "compiler/shader_enums.h"
 #include "util/os_time.h"

diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index 77bf6ab..0c3c096 100644 (file)
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -38,7 +38,7 @@
 #define P_SCREEN_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_video_enums.h"

diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 8d412f5..1c3f77f 100644 (file)
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -46,7 +46,7 @@
 
 #include "util/u_memory.h"
 
-#include "p_compiler.h"
+#include "util/compiler.h"
 #include "p_defines.h"
 #include "util/format/u_formats.h"
 

diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c
index 4515b76..fa1c4d2 100644 (file)
--- a/src/gallium/targets/libgl-xlib/xlib.c
+++ b/src/gallium/targets/libgl-xlib/xlib.c
@@ -30,7 +30,7 @@
  * Authors:
  *   Keith Whitwell
  */
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "sw/xlib/xlib_sw_winsys.h"
 

diff --git a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c
index e530240..5315fd7 100644 (file)
--- a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c
+++ b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c
@@ -42,7 +42,7 @@
 #endif
 #include <inttypes.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"

diff --git a/src/gallium/winsys/svga/drm/vmw_buffer.h b/src/gallium/winsys/svga/drm/vmw_buffer.h
index 4068ace..deebb0e 100644 (file)
--- a/src/gallium/winsys/svga/drm/vmw_buffer.h
+++ b/src/gallium/winsys/svga/drm/vmw_buffer.h
@@ -28,7 +28,7 @@
 #define VMW_BUFFER_H_
 
 #include <assert.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipebuffer/pb_bufmgr.h"
 #include "util/u_debug_flush.h"
 

diff --git a/src/gallium/winsys/svga/drm/vmw_context.h b/src/gallium/winsys/svga/drm/vmw_context.h
index 87d54e5..347e05d 100644 (file)
--- a/src/gallium/winsys/svga/drm/vmw_context.h
+++ b/src/gallium/winsys/svga/drm/vmw_context.h
@@ -32,7 +32,7 @@
 #define VMW_CONTEXT_H_
 
 #include <stdio.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct svga_winsys_screen;
 struct svga_winsys_context;

diff --git a/src/gallium/winsys/svga/drm/vmw_fence.h b/src/gallium/winsys/svga/drm/vmw_fence.h
index aab558f..7c6b57a 100644 (file)
--- a/src/gallium/winsys/svga/drm/vmw_fence.h
+++ b/src/gallium/winsys/svga/drm/vmw_fence.h
@@ -28,7 +28,7 @@
 #define VMW_FENCE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipebuffer/pb_buffer_fenced.h"
 
 struct pipe_fence_handle;

diff --git a/src/gallium/winsys/svga/drm/vmw_screen.c b/src/gallium/winsys/svga/drm/vmw_screen.c
index e585659..7db2872 100644 (file)
--- a/src/gallium/winsys/svga/drm/vmw_screen.c
+++ b/src/gallium/winsys/svga/drm/vmw_screen.c
@@ -32,7 +32,7 @@
 
 #include "util/os_file.h"
 #include "util/u_memory.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_hash_table.h"
 #ifdef MAJOR_IN_MKDEV
 #include <sys/mkdev.h>

diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h
index 4b7561f..d6d02da 100644 (file)
--- a/src/gallium/winsys/svga/drm/vmw_screen.h
+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
@@ -35,7 +35,7 @@
 #define VMW_SCREEN_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #include "svga_winsys.h"

diff --git a/src/gallium/winsys/svga/drm/vmw_screen_dri.c b/src/gallium/winsys/svga/drm/vmw_screen_dri.c
index 73f7651..dfcc15b 100644 (file)
--- a/src/gallium/winsys/svga/drm/vmw_screen_dri.c
+++ b/src/gallium/winsys/svga/drm/vmw_screen_dri.c
@@ -24,7 +24,7 @@
  **********************************************************/
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "util/format/u_format.h"

diff --git a/src/gallium/winsys/svga/drm/vmw_shader.h b/src/gallium/winsys/svga/drm/vmw_shader.h
index a62a814..d851be4 100644 (file)
--- a/src/gallium/winsys/svga/drm/vmw_shader.h
+++ b/src/gallium/winsys/svga/drm/vmw_shader.h
@@ -34,7 +34,7 @@
 #ifndef VMW_SHADER_H_
 #define VMW_SHADER_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_atomic.h"
 #include "util/u_inlines.h"
 

diff --git a/src/gallium/winsys/svga/drm/vmw_surface.h b/src/gallium/winsys/svga/drm/vmw_surface.h
index d7acce7..1e6e31c 100644 (file)
--- a/src/gallium/winsys/svga/drm/vmw_surface.h
+++ b/src/gallium/winsys/svga/drm/vmw_surface.h
@@ -35,7 +35,7 @@
 #define VMW_SURFACE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_atomic.h"
 #include "util/u_inlines.h"
 #include "util/u_thread.h"

diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.c b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
index 35a267f..464caac 100644 (file)
--- a/src/gallium/winsys/sw/dri/dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
@@ -37,7 +37,7 @@
 #endif
 #endif
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"

diff --git a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
index c882b1d..1fc1d9b 100644 (file)
--- a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
+++ b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
@@ -3,7 +3,7 @@
 
 #include <windows.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "frontend/sw_winsys.h"
 
 void gdi_sw_display( struct sw_winsys *winsys,

diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp
index f0f772d..2bc1b97 100644 (file)
--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "util/format/u_formats.h"
 #include "util/u_inlines.h"

diff --git a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
index 5761c0e..206ec90 100644 (file)
--- a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
@@ -42,7 +42,7 @@
 #include <fcntl.h>
 #include <xf86drm.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"

diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
index 29cfb3a..0228285 100644 (file)
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
@@ -24,7 +24,7 @@
 #define VIRGL_DRM_WINSYS_H
 
 #include <stdint.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 #include "util/list.h"

diff --git a/src/mesa/state_tracker/st_cb_flush.h b/src/mesa/state_tracker/st_cb_flush.h
index daee040..72029cc 100644 (file)
--- a/src/mesa/state_tracker/st_cb_flush.h
+++ b/src/mesa/state_tracker/st_cb_flush.h
@@ -30,7 +30,7 @@
 #define ST_CB_FLUSH_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct dd_function_table;
 struct pipe_fence_handle;

diff --git a/src/mesa/state_tracker/st_debug.h b/src/mesa/state_tracker/st_debug.h
index 35a194e..0d86379 100644 (file)
--- a/src/mesa/state_tracker/st_debug.h
+++ b/src/mesa/state_tracker/st_debug.h
@@ -29,7 +29,7 @@
 #ifndef ST_DEBUG_H
 #define ST_DEBUG_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 struct st_context;

diff --git a/src/mesa/state_tracker/st_manager.h b/src/mesa/state_tracker/st_manager.h
index 7c2c4b6..4a617ed 100644 (file)
--- a/src/mesa/state_tracker/st_manager.h
+++ b/src/mesa/state_tracker/st_manager.h
@@ -31,7 +31,7 @@
 #include "main/menums.h"
 #include "main/fbobject.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 
 struct st_context;

diff --git a/src/mesa/state_tracker/st_sampler_view.h b/src/mesa/state_tracker/st_sampler_view.h
index c7c9f60..74b6c09 100644 (file)
--- a/src/mesa/state_tracker/st_sampler_view.h
+++ b/src/mesa/state_tracker/st_sampler_view.h
@@ -27,7 +27,7 @@
 #ifndef ST_SAMPLER_VIEW_H
 #define ST_SAMPLER_VIEW_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "util/u_sampler.h"

diff --git a/src/util/format/u_format_bptc.h b/src/util/format/u_format_bptc.h
index 5dda636..4a98107 100644 (file)
--- a/src/util/format/u_format_bptc.h
+++ b/src/util/format/u_format_bptc.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_BPTC_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "c99_compat.h"
 

diff --git a/src/util/format/u_format_etc.c b/src/util/format/u_format_etc.c
index 2b5d97f..878c476 100644 (file)
--- a/src/util/format/u_format_etc.c
+++ b/src/util/format/u_format_etc.c
@@ -1,4 +1,4 @@
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_math.h"
 #include "util/format/u_format_etc.h"

diff --git a/src/util/format/u_format_fxt1.h b/src/util/format/u_format_fxt1.h
index a9a8feb..71a44ad 100644 (file)
--- a/src/util/format/u_format_fxt1.h
+++ b/src/util/format/u_format_fxt1.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_FXT1_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "c99_compat.h"
 

diff --git a/src/util/format/u_format_other.h b/src/util/format/u_format_other.h
index 21095be..2a325fb 100644 (file)
--- a/src/util/format/u_format_other.h
+++ b/src/util/format/u_format_other.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_OTHER_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "c99_compat.h"
 

diff --git a/src/util/format/u_format_pack.py b/src/util/format/u_format_pack.py
index b68669f..72f66ef 100644 (file)
--- a/src/util/format/u_format_pack.py
+++ b/src/util/format/u_format_pack.py
@@ -692,7 +692,7 @@ def is_format_hand_written(format):
 
 def generate(formats):
     print()
-    print('#include "pipe/p_compiler.h"')
+    print('#include "util/compiler.h"')
     print('#include "util/u_math.h"')
     print('#include "util/half_float.h"')
     print('#include "u_format.h"')

diff --git a/src/util/format/u_format_s3tc.h b/src/util/format/u_format_s3tc.h
index 61b039c..3acaa3d 100644 (file)
--- a/src/util/format/u_format_s3tc.h
+++ b/src/util/format/u_format_s3tc.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_S3TC_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "c99_compat.h"
 

diff --git a/src/util/format/u_format_tests.h b/src/util/format/u_format_tests.h
index 5ef3eed..9b349cc 100644 (file)
--- a/src/util/format/u_format_tests.h
+++ b/src/util/format/u_format_tests.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_TESTS_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 
 

diff --git a/src/util/format/u_format_yuv.h b/src/util/format/u_format_yuv.h
index afa4a3a..d73527d 100644 (file)
--- a/src/util/format/u_format_yuv.h
+++ b/src/util/format/u_format_yuv.h
@@ -45,7 +45,7 @@
 #define U_FORMAT_YUV_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_math.h"
 
 #include "c99_compat.h"

diff --git a/src/util/format/u_format_zs.h b/src/util/format/u_format_zs.h
index 107cce8..00bc0a7 100644 (file)
--- a/src/util/format/u_format_zs.h
+++ b/src/util/format/u_format_zs.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_ZS_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "c99_compat.h"
 

diff --git a/src/util/u_cpu_detect.c b/src/util/u_cpu_detect.c
index ebb97a2..ee38d3f 100644 (file)
--- a/src/util/u_cpu_detect.c
+++ b/src/util/u_cpu_detect.c
@@ -33,7 +33,7 @@
  */
 
 #include "util/detect.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_debug.h"
 #include "u_cpu_detect.h"

diff --git a/src/util/u_debug_symbol.c b/src/util/u_debug_symbol.c
index 0a714a0..5f8da42 100644 (file)
--- a/src/util/u_debug_symbol.c
+++ b/src/util/u_debug_symbol.c
@@ -32,7 +32,7 @@
  * @author Jose Fonseca <jfonseca@vmware.com>
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_thread.h"
 #include "util/simple_mtx.h"
 #include "util/u_string.h"