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>
2026-01-01 05:20:09 +01:00 · 2023-06-12 01:10:24 +08:00 · 2023-06-12 01:10:24 +08:00 · 739ba18c79
commit 739ba18c79
parent 0d82c0a026
188 changed files with 188 additions and 222 deletions
--- 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.

--- 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" {
--- 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"

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


--- 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"
--- 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"
--- 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"
--- 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;
--- 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"
--- 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"
--- 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" {
--- 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"
--- 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;
--- 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"

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

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


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

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

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

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

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

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

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

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

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

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

--- 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
--- 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" {
--- 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"

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

--- 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" {
--- 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"

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

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


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

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


--- 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"
--- 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"
--- 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" {
--- 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
--- 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"


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

--- 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
--- 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"
--- 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" {
--- 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" {
--- 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"

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

--- 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"
--- 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];

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

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

--- 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"
--- 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"
--- 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
--- 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;
--- 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"
--- 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
--- 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"
--- 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;
--- a/Show more
+++ b/Show more