diff options
65 files changed, 81 insertions, 171 deletions
diff --git a/src/gallium/auxiliary/draw/draw_llvm.h b/src/gallium/auxiliary/draw/draw_llvm.h index 39d2e62f084..94a8c2c357a 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.h +++ b/src/gallium/auxiliary/draw/draw_llvm.h @@ -34,8 +34,8 @@ #include "draw/draw_gs.h" #include "draw/draw_tess.h" +#include "gallivm/lp_bld.h" #include "gallivm/lp_bld_sample.h" -#include "gallivm/lp_bld_limits.h" #include "gallivm/lp_bld_jit_types.h" #include "gallivm/lp_bld_jit_sample.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c index 976307a595a..7127f697abe 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c @@ -46,12 +46,12 @@ #include <float.h> +#include <math.h> #include <llvm/Config/llvm-config.h> -#include "util/u_memory.h" +#include "util/bitscan.h" #include "util/u_debug.h" -#include "util/u_math.h" #include "util/u_cpu_detect.h" #include "lp_bld_type.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.h b/src/gallium/auxiliary/gallivm/lp_bld_arit.h index f64dfb3dd6f..02ca8bacdd5 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_arit.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.h @@ -36,10 +36,9 @@ #ifndef LP_BLD_ARIT_H #define LP_BLD_ARIT_H +#include <stdbool.h> -#include "gallivm/lp_bld.h" -#include "util/compiler.h" - +#include <llvm-c/Core.h> struct lp_type; struct lp_build_context; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.c b/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.c index 3bf00faf538..99e11087548 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.c @@ -37,20 +37,10 @@ #include "lp_bld_arit_overflow.h" -#include "lp_bld_type.h" -#include "lp_bld_const.h" #include "lp_bld_init.h" #include "lp_bld_intr.h" -#include "lp_bld_logic.h" -#include "lp_bld_pack.h" -#include "lp_bld_debug.h" -#include "lp_bld_bitarit.h" - -#include "util/u_memory.h" -#include "util/u_debug.h" -#include "util/u_math.h" -#include "util/u_string.h" -#include "util/u_cpu_detect.h" + +#include "util/macros.h" #include <float.h> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.h b/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.h index 34ce00ee0e8..c483b00c21a 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.h @@ -38,7 +38,7 @@ #define LP_BLD_ARIT_OVERFLOW_H -#include "gallivm/lp_bld.h" +#include <llvm-c/Core.h> struct gallivm_state; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_assert.c b/src/gallium/auxiliary/gallivm/lp_bld_assert.c index f50da3c127e..f847c74743c 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_assert.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_assert.c @@ -26,11 +26,9 @@ **************************************************************************/ #include "util/u_debug.h" -#include "util/u_memory.h" #include "lp_bld_assert.h" #include "lp_bld_init.h" #include "lp_bld_const.h" -#include "lp_bld_printf.h" /** diff --git a/src/gallium/auxiliary/gallivm/lp_bld_assert.h b/src/gallium/auxiliary/gallivm/lp_bld_assert.h index e377b59bbed..ed6a03908c2 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_assert.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_assert.h @@ -28,9 +28,9 @@ #ifndef LP_BLD_ASSERT_H #define LP_BLD_ASSERT_H +#include <llvm-c/Core.h> -#include "lp_bld.h" -#include "lp_bld_init.h" +struct gallivm_state; void diff --git a/src/gallium/auxiliary/gallivm/lp_bld_bitarit.c b/src/gallium/auxiliary/gallivm/lp_bld_bitarit.c index 97e5a137e89..3f64bcf376f 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_bitarit.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_bitarit.c @@ -26,10 +26,7 @@ **************************************************************************/ -#include "util/u_debug.h" - #include "lp_bld_type.h" -#include "lp_bld_debug.h" #include "lp_bld_const.h" #include "lp_bld_bitarit.h" #include "lp_bld_intr.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_bitarit.h b/src/gallium/auxiliary/gallivm/lp_bld_bitarit.h index ae85ea4b16d..bdf3bf6771b 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_bitarit.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_bitarit.h @@ -37,7 +37,7 @@ #define LP_BLD_BITARIT_H -#include "gallivm/lp_bld.h" +#include <llvm-c/Core.h> struct lp_type; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_const.c b/src/gallium/auxiliary/gallivm/lp_bld_const.c index 0c146a103e9..65484b175bf 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_const.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_const.c @@ -35,8 +35,6 @@ #include <float.h> -#include "util/u_debug.h" -#include "util/u_math.h" #include "util/half_float.h" #include "lp_bld_type.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_const.h b/src/gallium/auxiliary/gallivm/lp_bld_const.h index 6d9d5410d69..ec34699a8b9 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_const.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_const.h @@ -37,8 +37,6 @@ #define LP_BLD_CONST_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_conv.c b/src/gallium/auxiliary/gallivm/lp_bld_conv.c index 86a1425ffe4..ac1d442b1e9 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_conv.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_conv.c @@ -61,8 +61,6 @@ */ -#include "util/u_debug.h" -#include "util/u_math.h" #include "util/half_float.h" #include "util/u_cpu_detect.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_conv.h b/src/gallium/auxiliary/gallivm/lp_bld_conv.h index 42a11137473..bfc1993a220 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_conv.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_conv.h @@ -37,9 +37,10 @@ #define LP_BLD_CONV_H -#include "gallivm/lp_bld.h" +#include "gallivm/lp_bld_type.h" +struct gallivm_state; struct lp_type; LLVMValueRef diff --git a/src/gallium/auxiliary/gallivm/lp_bld_coro.h b/src/gallium/auxiliary/gallivm/lp_bld_coro.h index 5421d0926ca..1377c5a7ca3 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_coro.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_coro.h @@ -27,9 +27,7 @@ #define LP_BLD_CORO_H #include <stdbool.h> -#include "util/compiler.h" -#include "gallivm/lp_bld.h" -#include "gallivm/lp_bld_intr.h" +#include "lp_bld_intr.h" #ifdef __cplusplus extern "C" { diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index c0540a85092..5d68ee6d801 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -26,7 +26,6 @@ **************************************************************************/ #include <stddef.h> -#include <fstream> #include <sstream> #include <iomanip> @@ -43,11 +42,12 @@ #include <llvm/Support/Host.h> #endif -#include "util/detect_os.h" -#include "util/u_math.h" +#include "util/bitscan.h" #include "util/u_debug.h" #include "util/os_file.h" +#include "util/u_string.h" // asprintf on MSVC +#include "lp_bld_init.h" #include "lp_bld_debug.h" #include "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 de42f7309be..4bebd8475cb 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.h @@ -30,14 +30,16 @@ #define LP_BLD_DEBUG_H -#include "gallivm/lp_bld_init.h" +#include <stdarg.h> +#include <stdio.h> +#include <stdbool.h> -#include "util/compiler.h" #include "util/detect_os.h" -#include "util/u_string.h" +#include <llvm-c/Core.h> #include <llvm-c/DebugInfo.h> +struct gallivm_state; #define GALLIVM_DEBUG_TGSI (1 << 0) #define GALLIVM_DEBUG_IR (1 << 1) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_flow.c b/src/gallium/auxiliary/gallivm/lp_bld_flow.c index 4fde85b948e..f4f0a8c9222 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_flow.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_flow.c @@ -31,9 +31,6 @@ * @author Jose Fonseca <jfonseca@vmware.com> */ -#include "util/u_debug.h" -#include "util/u_memory.h" - #include "lp_bld_init.h" #include "lp_bld_type.h" #include "lp_bld_flow.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_flow.h b/src/gallium/auxiliary/gallivm/lp_bld_flow.h index f1d034ca0a2..32c44a48e3d 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_flow.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_flow.h @@ -35,12 +35,13 @@ #define LP_BLD_FLOW_H -#include "gallivm/lp_bld.h" +#include "gallivm/lp_bld_type.h" #ifdef __cplusplus extern "C" { #endif +struct gallivm_state; struct lp_type; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format.h b/src/gallium/auxiliary/gallivm/lp_bld_format.h index 4f0bb28a84a..e5001d05cc7 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_format.h @@ -34,10 +34,8 @@ * Pixel format helpers. */ -#include "gallivm/lp_bld.h" #include "gallivm/lp_bld_init.h" - -#include "util/format/u_formats.h" +#include "util/macros.h" struct util_format_description; struct lp_type; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c index 8a7d5717d95..85ebf9098af 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c @@ -34,11 +34,8 @@ #include "util/format/u_format.h" -#include "util/u_memory.h" -#include "util/u_math.h" +#include "util/bitscan.h" #include "util/u_pointer.h" -#include "util/u_string.h" -#include "util/u_cpu_detect.h" #include "lp_bld_arit.h" #include "lp_bld_init.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_aos_array.c b/src/gallium/auxiliary/gallivm/lp_bld_format_aos_array.c index 4e4cf8f959f..3ce654663eb 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_aos_array.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_aos_array.c @@ -26,18 +26,13 @@ **************************************************************************/ #include "lp_bld_const.h" -#include "lp_bld_struct.h" #include "lp_bld_format.h" -#include "lp_bld_debug.h" #include "lp_bld_type.h" #include "lp_bld_conv.h" #include "lp_bld_pack.h" #include "lp_bld_intr.h" -#include "lp_bld_gather.h" -#include "util/u_memory.h" #include "util/format/u_format.h" -#include "pipe/p_state.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_float.c b/src/gallium/auxiliary/gallivm/lp_bld_format_float.c index b0d1e806757..2fe45e0eadf 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_float.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_float.c @@ -34,8 +34,6 @@ */ -#include "util/u_debug.h" - #include "lp_bld_type.h" #include "lp_bld_const.h" #include "lp_bld_arit.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_s3tc.c b/src/gallium/auxiliary/gallivm/lp_bld_format_s3tc.c index e1006808bf4..3e50adecb84 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_s3tc.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_s3tc.c @@ -38,9 +38,7 @@ #include "util/format/u_format.h" #include "util/u_math.h" -#include "util/u_string.h" #include "util/u_cpu_detect.h" -#include "util/u_debug.h" #include "lp_bld_arit.h" #include "lp_bld_type.h" @@ -51,8 +49,6 @@ #include "lp_bld_logic.h" #include "lp_bld_pack.h" #include "lp_bld_flow.h" -#include "lp_bld_printf.h" -#include "lp_bld_struct.h" #include "lp_bld_swizzle.h" #include "lp_bld_init.h" #include "lp_bld_debug.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c index 201f2f4b5d6..5740023d40c 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c @@ -26,11 +26,7 @@ **************************************************************************/ -#include "pipe/p_defines.h" - #include "util/format/u_format.h" -#include "util/u_memory.h" -#include "util/u_string.h" #include "util/u_math.h" #include "lp_bld_type.h" @@ -43,7 +39,6 @@ #include "lp_bld_arit.h" #include "lp_bld_pack.h" #include "lp_bld_flow.h" -#include "lp_bld_printf.h" #include "lp_bld_intr.h" static void diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c b/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c index 5cd6ebe7149..6c1d66849d6 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c @@ -67,8 +67,7 @@ */ -#include "util/u_debug.h" -#include "util/u_math.h" +#include <math.h> #include "lp_bld_type.h" #include "lp_bld_const.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_gather.c b/src/gallium/auxiliary/gallivm/lp_bld_gather.c index e21c195bbce..fa0655e8137 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_gather.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_gather.c @@ -26,10 +26,8 @@ **************************************************************************/ -#include "util/u_debug.h" #include "util/u_cpu_detect.h" -#include "util/u_math.h" -#include "lp_bld_debug.h" +#include "util/bitscan.h" #include "lp_bld_const.h" #include "lp_bld_format.h" #include "lp_bld_gather.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_gather.h b/src/gallium/auxiliary/gallivm/lp_bld_gather.h index 126924a0c40..3fcbabf4632 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_gather.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_gather.h @@ -30,8 +30,9 @@ #define LP_BLD_GATHER_H_ -#include "gallivm/lp_bld.h" +#include "gallivm/lp_bld_type.h" +struct gallivm_state; LLVMValueRef lp_build_gather_elem_ptr(struct gallivm_state *gallivm, diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c index d98f0ef3994..7bf8902260f 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c @@ -26,10 +26,6 @@ **************************************************************************/ -#include "util/detect.h" -#include "util/compiler.h" -#include "util/macros.h" -#include "util/u_cpu_detect.h" #include "util/u_debug.h" #include "util/u_memory.h" #include "util/os_time.h" @@ -39,6 +35,7 @@ #include "lp_bld_init.h" #include "lp_bld_coro.h" #include "lp_bld_printf.h" +#include "lp_bld_passmgr.h" #include <llvm/Config/llvm-config.h> #include <llvm-c/Analysis.h> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.h b/src/gallium/auxiliary/gallivm/lp_bld_init.h index e58661fdf62..2ecfd0bfcb6 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.h @@ -29,12 +29,15 @@ #ifndef LP_BLD_INIT_H #define LP_BLD_INIT_H +#include <stdbool.h> -#include "util/compiler.h" #include "util/u_pointer.h" // for func_pointer + +#if DETECT_ARCH_PPC_64 #include "util/u_cpu_detect.h" -#include "lp_bld.h" -#include "lp_bld_passmgr.h" +#endif + +#include <llvm-c/Core.h> #if GALLIVM_USE_ORCJIT #include <llvm-c/Orc.h> @@ -48,6 +51,7 @@ extern "C" { struct lp_cached_code; struct lp_jit_texture; +struct lp_context_ref; struct gallivm_state { @@ -96,7 +100,7 @@ lp_build_init(void); struct gallivm_state * -gallivm_create(const char *name, lp_context_ref *context, +gallivm_create(const char *name, struct lp_context_ref *context, struct lp_cached_code *cache); void diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init_common.c b/src/gallium/auxiliary/gallivm/lp_bld_init_common.c index 324555b6205..18ad4f8e11e 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_init_common.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_init_common.c @@ -27,7 +27,6 @@ #include "util/u_debug.h" #include "util/u_cpu_detect.h" -#include "lp_bld.h" #include "lp_bld_debug.h" #include "lp_bld_init.h" #include "lp_bld_type.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_intr.c b/src/gallium/auxiliary/gallivm/lp_bld_intr.c index a98014f5442..26237824153 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_intr.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_intr.c @@ -46,7 +46,6 @@ #include <llvm/Config/llvm-config.h> #include "util/u_debug.h" -#include "util/u_string.h" #include "util/bitscan.h" #include "lp_bld_const.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_intr.h b/src/gallium/auxiliary/gallivm/lp_bld_intr.h index a9540292211..5af4039f8f9 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_intr.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_intr.h @@ -38,13 +38,13 @@ #include <llvm/Config/llvm-config.h> -#include "gallivm/lp_bld.h" -#include "gallivm/lp_bld_init.h" +#include <llvm-c/Core.h> #ifdef __cplusplus extern "C" { #endif +struct gallivm_state; struct lp_type; /** diff --git a/src/gallium/auxiliary/gallivm/lp_bld_ir_common.h b/src/gallium/auxiliary/gallivm/lp_bld_ir_common.h index 3b4c9614f9e..c46aa8cf527 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_ir_common.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_ir_common.h @@ -33,9 +33,11 @@ extern "C" { #endif -#include "gallivm/lp_bld.h" +#include <llvm-c/Core.h> #include "gallivm/lp_bld_limits.h" +struct gallivm_state; + /* SM 4.0 says that subroutines can nest 32 deep and * we need one more for our main function */ #define LP_MAX_NUM_FUNCS 33 diff --git a/src/gallium/auxiliary/gallivm/lp_bld_jit_sample.c b/src/gallium/auxiliary/gallivm/lp_bld_jit_sample.c index 6c0e732183b..62c53ab3474 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_jit_sample.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_jit_sample.c @@ -26,7 +26,6 @@ **************************************************************************/ #include "gallivm/lp_bld_sample.h" -#include "gallivm/lp_bld_limits.h" #include "gallivm/lp_bld_tgsi.h" #include "gallivm/lp_bld_type.h" #include "gallivm/lp_bld_init.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_jit_sample.h b/src/gallium/auxiliary/gallivm/lp_bld_jit_sample.h index 63b993cea80..ce4c928d388 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_jit_sample.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_jit_sample.h @@ -28,6 +28,8 @@ #ifndef LP_JIT_SAMPLE_H #define LP_JIT_SAMPLE_H +#include "gallivm/lp_bld_sample.h" + struct lp_sampler_static_state { /* diff --git a/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c b/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c index c98349a844a..634d93b9786 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c @@ -21,15 +21,12 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "util/compiler.h" -#include "gallivm/lp_bld.h" #include "gallivm/lp_bld_init.h" #include "gallivm/lp_bld_struct.h" #include "gallivm/lp_bld_sample.h" #include "gallivm/lp_bld_const.h" #include "gallivm/lp_bld_debug.h" #include "gallivm/lp_bld_flow.h" -#include "gallivm/lp_bld_ir_common.h" #include "draw/draw_vertex_header.h" #include "lp_bld_jit_types.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_jit_types.h b/src/gallium/auxiliary/gallivm/lp_bld_jit_types.h index 2c3a4756a40..1242736c5d9 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_jit_types.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_jit_types.h @@ -26,7 +26,6 @@ #include "gallivm/lp_bld_limits.h" #include "gallivm/lp_bld_sample.h" -#include "gallivm/lp_bld_struct.h" struct lp_sampler_dynamic_state; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_logic.c b/src/gallium/auxiliary/gallivm/lp_bld_logic.c index 1aa775f6e4a..65cb2732a63 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_logic.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_logic.c @@ -35,7 +35,6 @@ #include <llvm/Config/llvm-config.h> #include "util/u_cpu_detect.h" -#include "util/u_memory.h" #include "util/u_debug.h" #include "lp_bld_type.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_logic.h b/src/gallium/auxiliary/gallivm/lp_bld_logic.h index 2278a8be9cc..4888420dd2b 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_logic.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_logic.h @@ -40,12 +40,13 @@ extern "C" { #endif -#include "gallivm/lp_bld.h" +#include <llvm-c/Core.h> #include "pipe/p_defines.h" /* For PIPE_FUNC_xxx */ struct lp_type; +struct gallivm_state; struct lp_build_context; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index d093ac8d2e9..d3ad3423bac 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -80,8 +80,6 @@ #endif #include "c11/threads.h" -#include "util/u_thread.h" -#include "util/detect.h" #include "util/u_debug.h" #include "util/u_cpu_detect.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.h b/src/gallium/auxiliary/gallivm/lp_bld_misc.h index 302f2d445da..1b2db8de9dc 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.h @@ -29,8 +29,8 @@ #ifndef LP_BLD_MISC_H #define LP_BLD_MISC_H +#include <stdbool.h> -#include "lp_bld.h" #include <llvm/Config/llvm-config.h> #include <llvm-c/ExecutionEngine.h> #include <llvm-c/Target.h> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/src/gallium/auxiliary/gallivm/lp_bld_nir.c index 208c82d4376..dcff0031cf4 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.c @@ -24,21 +24,7 @@ **************************************************************************/ #include "lp_bld_nir.h" -#include "lp_bld_arit.h" -#include "lp_bld_bitarit.h" -#include "lp_bld_const.h" -#include "lp_bld_conv.h" -#include "lp_bld_gather.h" -#include "lp_bld_logic.h" -#include "lp_bld_quad.h" -#include "lp_bld_flow.h" -#include "lp_bld_intr.h" -#include "lp_bld_struct.h" -#include "lp_bld_debug.h" -#include "lp_bld_printf.h" #include "nir.h" -#include "nir_deref.h" -#include "nir_search_helpers.h" /* do some basic opts to remove some things we don't want to see. */ void diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.h b/src/gallium/auxiliary/gallivm/lp_bld_nir.h index ba7d4b8c1c1..9fe99ab4bee 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.h @@ -26,15 +26,16 @@ #ifndef LP_BLD_NIR_H #define LP_BLD_NIR_H -#include "gallivm/lp_bld.h" -#include "gallivm/lp_bld_limits.h" -#include "gallivm/lp_bld_flow.h" -#include "lp_bld_type.h" +#include <llvm-c/Core.h> -#include "gallivm/lp_bld_tgsi.h" +#include "lp_bld_type.h" #include "nir.h" +struct gallivm_state; struct nir_shader; +struct lp_img_params; +struct lp_build_tgsi_params; +struct lp_build_sampler_aos; /* * 2 reserved functions args for each function call, diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_nir_aos.c index 16c7d8a494f..a742773e221 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir_aos.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir_aos.c @@ -30,11 +30,11 @@ #include "lp_bld_const.h" #include "lp_bld_flow.h" #include "lp_bld_quad.h" -#include "lp_bld_struct.h" +#include "lp_bld_sample.h" #include "lp_bld_swizzle.h" +#include "lp_bld_tgsi.h" #include "lp_bld_debug.h" #include "util/u_math.h" -#include "nir_deref.h" struct lp_build_nir_aos_context diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c index e21023b8319..a31adf90160 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c @@ -39,6 +39,7 @@ #include "lp_bld_coro.h" #include "lp_bld_printf.h" #include "lp_bld_intr.h" +#include "lp_bld_tgsi.h" #include "util/u_cpu_detect.h" #include "util/u_math.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_pack.c b/src/gallium/auxiliary/gallivm/lp_bld_pack.c index bb392e88555..3086c9a4c97 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_pack.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_pack.c @@ -66,10 +66,8 @@ */ -#include "util/u_debug.h" -#include "util/u_math.h" +#include "util/bitscan.h" #include "util/u_cpu_detect.h" -#include "util/u_memory.h" #include "lp_bld_type.h" #include "lp_bld_const.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_pack.h b/src/gallium/auxiliary/gallivm/lp_bld_pack.h index deee1c4798e..03a6745b22e 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_pack.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_pack.h @@ -36,12 +36,12 @@ #ifndef LP_BLD_PACK_H #define LP_BLD_PACK_H +#include <stdbool.h> -#include "util/compiler.h" - -#include "gallivm/lp_bld.h" +#include <llvm-c/Core.h> +struct gallivm_state; struct lp_type; LLVMValueRef diff --git a/src/gallium/auxiliary/gallivm/lp_bld_passmgr.c b/src/gallium/auxiliary/gallivm/lp_bld_passmgr.c index 5dd38251cf1..b659c78879e 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_passmgr.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_passmgr.c @@ -26,11 +26,9 @@ **************************************************************************/ #include "util/u_debug.h" -#include "util/u_memory.h" #include "util/os_time.h" #include "lp_bld_debug.h" #include "lp_bld_passmgr.h" -#include "lp_bld_init.h" #define USE_NEW_PASS (LLVM_VERSION_MAJOR >= 15) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_passmgr.h b/src/gallium/auxiliary/gallivm/lp_bld_passmgr.h index 4ebf6149117..e4b3857b916 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_passmgr.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_passmgr.h @@ -28,7 +28,8 @@ #ifndef LP_BLD_PASSMGR_H #define LP_BLD_PASSMGR_H -#include "lp_bld.h" +#include <stdbool.h> + #include <llvm-c/ExecutionEngine.h> #ifdef __cplusplus diff --git a/src/gallium/auxiliary/gallivm/lp_bld_printf.c b/src/gallium/auxiliary/gallivm/lp_bld_printf.c index 6f39c59b04b..56fb621b99d 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_printf.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_printf.c @@ -29,9 +29,6 @@ #include <inttypes.h> #include "util/compiler.h" -#include "util/u_debug.h" -#include "util/u_memory.h" -#include "util/u_string.h" #include "lp_bld_const.h" #include "lp_bld_init.h" #include "lp_bld_const.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_printf.h b/src/gallium/auxiliary/gallivm/lp_bld_printf.h index 1973ef6f291..0b96961eef6 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_printf.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_printf.h @@ -32,9 +32,9 @@ extern "C" { #endif -#include "util/compiler.h" -#include "lp_bld.h" -#include "lp_bld_init.h" +#include <llvm-c/Core.h> + +struct gallivm_state; void lp_init_printf_hook(struct gallivm_state *gallivm); diff --git a/src/gallium/auxiliary/gallivm/lp_bld_quad.h b/src/gallium/auxiliary/gallivm/lp_bld_quad.h index e41f80efe2d..c20b4441b66 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_quad.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_quad.h @@ -30,9 +30,11 @@ #define LP_BLD_QUAD_H_ -#include "gallivm/lp_bld.h" +#include <llvm-c/Core.h> +struct gallivm_state; +struct lp_type; struct lp_build_context; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.h b/src/gallium/auxiliary/gallivm/lp_bld_sample.h index 86f0348d75a..96ed67d9158 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.h @@ -38,8 +38,6 @@ #include "pipe/p_state.h" #include "util/format/u_formats.h" -#include "util/u_debug.h" -#include "gallivm/lp_bld.h" #include "gallivm/lp_bld_type.h" #include "gallivm/lp_bld_swizzle.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c index e8965e1628b..a71d407d1df 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c @@ -34,14 +34,7 @@ */ #include "pipe/p_defines.h" -#include "pipe/p_state.h" -#include "util/u_debug.h" -#include "util/u_dump.h" -#include "util/u_memory.h" -#include "util/u_math.h" #include "util/format/u_format.h" -#include "util/u_cpu_detect.h" -#include "lp_bld_debug.h" #include "lp_bld_type.h" #include "lp_bld_const.h" #include "lp_bld_conv.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h index 3f9ee9cf670..004aa4956cf 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h @@ -36,9 +36,9 @@ #ifndef LP_BLD_SAMPLE_AOS_H #define LP_BLD_SAMPLE_AOS_H +#include <llvm-c/Core.h> -#include "lp_bld_sample.h" - +struct lp_build_sample_context; void lp_build_sample_aos(struct lp_build_sample_context *bld, diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c index 77fd4141553..7c928cb9a64 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c @@ -34,13 +34,9 @@ */ #include "pipe/p_defines.h" -#include "pipe/p_state.h" -#include "pipe/p_shader_tokens.h" #include "util/bitset.h" #include "util/compiler.h" #include "util/u_debug.h" -#include "util/u_dump.h" -#include "util/u_memory.h" #include "util/u_math.h" #include "util/format/u_format.h" #include "util/u_cpu_detect.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_struct.c b/src/gallium/auxiliary/gallivm/lp_bld_struct.c index 8c6c927f212..5cdce2968a4 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_struct.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_struct.c @@ -34,12 +34,10 @@ */ -#include "util/u_debug.h" -#include "util/u_memory.h" - #include "lp_bld_const.h" #include "lp_bld_debug.h" #include "lp_bld_struct.h" +#include "util/macros.h" LLVMValueRef lp_build_struct_get_ptr2(struct gallivm_state *gallivm, diff --git a/src/gallium/auxiliary/gallivm/lp_bld_struct.h b/src/gallium/auxiliary/gallivm/lp_bld_struct.h index 11f256964f5..b0e364bd366 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_struct.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_struct.h @@ -37,12 +37,9 @@ #define LP_BLD_STRUCT_H -#include "gallivm/lp_bld.h" -#include "gallivm/lp_bld_init.h" - -#include "util/u_debug.h" -#include "util/u_memory.h" +#include <llvm-c/Core.h> +struct gallivm_state; #define LP_CHECK_STRUCT_SIZE(_ctype, _ltarget, _ltype) \ assert(LLVMABISizeOfType(_ltarget, _ltype) == \ diff --git a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c index aa7bc1e858a..d28d5d01c38 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c @@ -33,7 +33,6 @@ */ #include <inttypes.h> /* for PRIx64 macro */ -#include "util/compiler.h" #include "util/u_debug.h" #include "lp_bld_type.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.h b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.h index 40edd33600f..76a3d257bde 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.h @@ -37,11 +37,12 @@ #define LP_BLD_SWIZZLE_H -#include "gallivm/lp_bld.h" -#include "pipe/p_defines.h" +#include <llvm-c/Core.h> + #include "util/format/u_formats.h" +struct gallivm_state; struct lp_type; struct lp_build_context; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h index 209d1f9fcd0..4f96be859a1 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h @@ -37,13 +37,11 @@ #ifndef LP_BLD_TGSI_H #define LP_BLD_TGSI_H -#include "gallivm/lp_bld.h" #include "gallivm/lp_bld_tgsi_action.h" #include "gallivm/lp_bld_limits.h" #include "gallivm/lp_bld_sample.h" #include "gallivm/lp_bld_ir_common.h" #include "lp_bld_type.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_tgsi_info.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c index 2732d31b7c3..693dc52a8f2 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c @@ -28,7 +28,6 @@ #include "util/compiler.h" #include "util/u_memory.h" -#include "util/u_math.h" #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_util.h" #include "tgsi/tgsi_dump.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c index b9db4ab785d..97fac427bb7 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c @@ -36,11 +36,8 @@ * Brian Paul, and others. */ -#include "util/detect.h" #include "pipe/p_shader_tokens.h" #include "util/u_debug.h" -#include "util/u_math.h" -#include "util/u_memory.h" #include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_exec.h" #include "tgsi/tgsi_info.h" @@ -56,7 +53,6 @@ #include "lp_bld_gather.h" #include "lp_bld_init.h" #include "lp_bld_logic.h" -#include "lp_bld_misc.h" #include "lp_bld_swizzle.h" #include "lp_bld_flow.h" #include "lp_bld_coro.h" diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.h b/src/gallium/auxiliary/gallivm/lp_bld_type.h index 813306bbae8..6df80ce17e1 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_type.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_type.h @@ -38,8 +38,8 @@ #include "util/format/u_format.h" -#include "util/compiler.h" -#include "gallivm/lp_bld.h" + +#include <llvm-c/Core.h> #ifdef __cplusplus extern "C" { diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index ab35d2516c6..14a19f9cc77 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -38,6 +38,7 @@ #include "draw/draw_context.h" #include "gallivm/lp_bld_type.h" #include "gallivm/lp_bld_nir.h" +#include "gallivm/lp_bld_init.h" #include "util/disk_cache.h" #include "util/hex.h" #include "util/os_misc.h" |