From 8048c1953c97de75ccbe33d719ca81f67a5ba255 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 1 Mar 2017 08:58:43 -0800 Subject: [PATCH] i965: Reduce cross-pollination between the DRI driver and compiler Reviewed-by: Kenneth Graunke --- src/intel/blorp/blorp_blit.c | 1 - src/intel/tools/disasm.c | 1 - src/mesa/drivers/dri/i965/brw_clip.c | 1 - src/mesa/drivers/dri/i965/brw_clip_line.c | 1 - src/mesa/drivers/dri/i965/brw_clip_point.c | 1 - src/mesa/drivers/dri/i965/brw_clip_tri.c | 1 - src/mesa/drivers/dri/i965/brw_clip_unfilled.c | 1 - src/mesa/drivers/dri/i965/brw_clip_util.c | 1 - src/mesa/drivers/dri/i965/brw_compiler.c | 2 +- src/mesa/drivers/dri/i965/brw_context.c | 1 - src/mesa/drivers/dri/i965/brw_cs.c | 2 -- src/mesa/drivers/dri/i965/brw_defines.h | 2 ++ src/mesa/drivers/dri/i965/brw_disasm.c | 3 ++- src/mesa/drivers/dri/i965/brw_draw.c | 1 - src/mesa/drivers/dri/i965/brw_eu.c | 3 ++- src/mesa/drivers/dri/i965/brw_eu_compact.c | 3 ++- src/mesa/drivers/dri/i965/brw_eu_emit.c | 1 - src/mesa/drivers/dri/i965/brw_eu_util.c | 1 - src/mesa/drivers/dri/i965/brw_ff_gs.c | 1 - src/mesa/drivers/dri/i965/brw_ff_gs_emit.c | 1 - src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs_builder.h | 1 - src/mesa/drivers/dri/i965/brw_fs_surface_builder.h | 1 - src/mesa/drivers/dri/i965/brw_gs.c | 1 - src/mesa/drivers/dri/i965/brw_inst.h | 3 ++- src/mesa/drivers/dri/i965/brw_interpolation_map.c | 1 - src/mesa/drivers/dri/i965/brw_ir_vec4.h | 1 - src/mesa/drivers/dri/i965/brw_link.cpp | 2 -- src/mesa/drivers/dri/i965/brw_nir.c | 1 + src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 2 +- src/mesa/drivers/dri/i965/brw_program.c | 1 - src/mesa/drivers/dri/i965/brw_program_cache.c | 2 +- src/mesa/drivers/dri/i965/brw_sf.c | 1 - src/mesa/drivers/dri/i965/brw_sf_emit.c | 1 - src/mesa/drivers/dri/i965/brw_shader.cpp | 3 ++- src/mesa/drivers/dri/i965/brw_shader.h | 3 ++- src/mesa/drivers/dri/i965/brw_state_dump.c | 1 - src/mesa/drivers/dri/i965/brw_state_upload.c | 1 + src/mesa/drivers/dri/i965/brw_tcs.c | 1 - src/mesa/drivers/dri/i965/brw_tes.c | 1 - src/mesa/drivers/dri/i965/brw_vec4.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4_builder.h | 1 - src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4_tes.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vs.h | 3 +-- src/mesa/drivers/dri/i965/brw_vue_map.c | 3 ++- src/mesa/drivers/dri/i965/brw_wm.c | 1 - src/mesa/drivers/dri/i965/brw_wm.h | 1 - src/mesa/drivers/dri/i965/gen7_cs_state.c | 3 +-- src/mesa/drivers/dri/i965/intel_debug.h | 3 +++ src/mesa/drivers/dri/i965/intel_screen.c | 2 +- src/mesa/drivers/dri/i965/test_eu_compact.c | 1 - src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp | 1 - src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp | 1 - 57 files changed, 34 insertions(+), 52 deletions(-) diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c index bb73e51de09..0cc5a840338 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -24,7 +24,6 @@ #include "compiler/nir/nir_builder.h" #include "blorp_priv.h" -#include "brw_meta_util.h" /* header-only include needed for _mesa_unorm_to_float and friends. */ #include "mesa/main/format_utils.h" diff --git a/src/intel/tools/disasm.c b/src/intel/tools/disasm.c index 4ac7b902564..96c6ce290a0 100644 --- a/src/intel/tools/disasm.c +++ b/src/intel/tools/disasm.c @@ -23,7 +23,6 @@ #include -#include "brw_context.h" #include "brw_inst.h" #include "brw_eu.h" diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c index e375674ec15..4187207c6d0 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.c +++ b/src/mesa/drivers/dri/i965/brw_clip.c @@ -36,7 +36,6 @@ #include "brw_defines.h" #include "brw_context.h" -#include "brw_eu.h" #include "brw_util.h" #include "brw_state.h" #include "brw_clip.h" diff --git a/src/mesa/drivers/dri/i965/brw_clip_line.c b/src/mesa/drivers/dri/i965/brw_clip_line.c index f9cabd2f98d..788dc9666ce 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_line.c +++ b/src/mesa/drivers/dri/i965/brw_clip_line.c @@ -37,7 +37,6 @@ #include "brw_defines.h" #include "brw_context.h" -#include "brw_eu.h" #include "brw_clip.h" diff --git a/src/mesa/drivers/dri/i965/brw_clip_point.c b/src/mesa/drivers/dri/i965/brw_clip_point.c index 5cf2f5eeee6..bdbf9695348 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_point.c +++ b/src/mesa/drivers/dri/i965/brw_clip_point.c @@ -37,7 +37,6 @@ #include "brw_defines.h" #include "brw_context.h" -#include "brw_eu.h" #include "brw_clip.h" diff --git a/src/mesa/drivers/dri/i965/brw_clip_tri.c b/src/mesa/drivers/dri/i965/brw_clip_tri.c index 52402e30bcf..d98e1ccb5f0 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_tri.c +++ b/src/mesa/drivers/dri/i965/brw_clip_tri.c @@ -37,7 +37,6 @@ #include "brw_defines.h" #include "brw_context.h" -#include "brw_eu.h" #include "brw_clip.h" static void release_tmps( struct brw_clip_compile *c ) diff --git a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c index 7c06857ff61..65ccf33e37b 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c +++ b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c @@ -37,7 +37,6 @@ #include "brw_defines.h" #include "brw_context.h" -#include "brw_eu.h" #include "brw_clip.h" diff --git a/src/mesa/drivers/dri/i965/brw_clip_util.c b/src/mesa/drivers/dri/i965/brw_clip_util.c index 4f1b0fd9fc9..e0fdd3d7eea 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_util.c +++ b/src/mesa/drivers/dri/i965/brw_clip_util.c @@ -38,7 +38,6 @@ #include "brw_defines.h" #include "brw_context.h" -#include "brw_eu.h" #include "brw_clip.h" diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c b/src/mesa/drivers/dri/i965/brw_compiler.c index 18ca4446e3e..f414099c7da 100644 --- a/src/mesa/drivers/dri/i965/brw_compiler.c +++ b/src/mesa/drivers/dri/i965/brw_compiler.c @@ -22,8 +22,8 @@ */ #include "brw_compiler.h" -#include "brw_context.h" #include "brw_shader.h" +#include "intel_debug.h" #include "compiler/nir/nir.h" #include "main/errors.h" #include "util/debug.h" diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index fb97743b86a..3688ba48111 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -53,7 +53,6 @@ #include "brw_context.h" #include "brw_defines.h" #include "brw_blorp.h" -#include "brw_compiler.h" #include "brw_draw.h" #include "brw_state.h" diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c index 16b7945bd7e..1653ad59c49 100644 --- a/src/mesa/drivers/dri/i965/brw_cs.c +++ b/src/mesa/drivers/dri/i965/brw_cs.c @@ -24,9 +24,7 @@ #include "util/ralloc.h" #include "brw_context.h" #include "brw_cs.h" -#include "brw_eu.h" #include "brw_wm.h" -#include "brw_shader.h" #include "intel_mipmap_tree.h" #include "brw_state.h" #include "intel_batchbuffer.h" diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h index f443cac3278..b08c40c4f10 100644 --- a/src/mesa/drivers/dri/i965/brw_defines.h +++ b/src/mesa/drivers/dri/i965/brw_defines.h @@ -29,6 +29,8 @@ * Keith Whitwell */ +#include "util/macros.h" + #define INTEL_MASK(high, low) (((1u<<((high)-(low)+1))-1)<<(low)) /* Using the GNU statement expression extension */ #define SET_FIELD(value, field) \ diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c index cd553b3cce0..6afbb24ed2b 100644 --- a/src/mesa/drivers/dri/i965/brw_disasm.c +++ b/src/mesa/drivers/dri/i965/brw_disasm.c @@ -24,8 +24,9 @@ #include #include -#include "brw_context.h" #include "brw_defines.h" +#include "brw_inst.h" +#include "brw_shader.h" #include "brw_reg.h" #include "brw_inst.h" #include "brw_eu.h" diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 940ce70c648..e3aaeb806de 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -45,7 +45,6 @@ #include "brw_defines.h" #include "brw_context.h" #include "brw_state.h" -#include "brw_vs.h" #include "intel_batchbuffer.h" #include "intel_buffers.h" diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/mesa/drivers/dri/i965/brw_eu.c index 6a422bb798b..e4cbf53e41b 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.c +++ b/src/mesa/drivers/dri/i965/brw_eu.c @@ -30,9 +30,10 @@ */ -#include "brw_context.h" #include "brw_defines.h" #include "brw_eu.h" +#include "brw_shader.h" +#include "intel_debug.h" #include "util/ralloc.h" diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c index 68321e785e8..778fb6aef98 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_compact.c +++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c @@ -72,9 +72,10 @@ * Gen 8 adds support for compacting 3-src instructions. */ -#include "brw_context.h" #include "brw_eu.h" +#include "brw_shader.h" #include "intel_asm_annotation.h" +#include "intel_debug.h" #include "util/u_atomic.h" /* for p_atomic_cmpxchg */ static const uint32_t g45_control_index_table[32] = { diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c index f4bec33f53b..be4f46faa29 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_emit.c +++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c @@ -30,7 +30,6 @@ */ -#include "brw_context.h" #include "brw_defines.h" #include "brw_eu.h" diff --git a/src/mesa/drivers/dri/i965/brw_eu_util.c b/src/mesa/drivers/dri/i965/brw_eu_util.c index f74e3fe58d3..4de0db45918 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_util.c +++ b/src/mesa/drivers/dri/i965/brw_eu_util.c @@ -30,7 +30,6 @@ */ -#include "brw_context.h" #include "brw_defines.h" #include "brw_eu.h" diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.c b/src/mesa/drivers/dri/i965/brw_ff_gs.c index 0316d0f8c3b..b7b4b716011 100644 --- a/src/mesa/drivers/dri/i965/brw_ff_gs.c +++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c @@ -37,7 +37,6 @@ #include "brw_defines.h" #include "brw_context.h" -#include "brw_eu.h" #include "brw_util.h" #include "brw_state.h" #include "brw_ff_gs.h" diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c index 7a3e62a7d2b..6941268c341 100644 --- a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c +++ b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c @@ -38,7 +38,6 @@ #include "brw_defines.h" #include "brw_context.h" -#include "brw_eu.h" #include "brw_ff_gs.h" /** diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 67bdb7a43e5..f5773864bd1 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -29,7 +29,6 @@ */ #include "main/macros.h" -#include "brw_context.h" #include "brw_eu.h" #include "brw_fs.h" #include "brw_cs.h" @@ -38,6 +37,7 @@ #include "brw_cfg.h" #include "brw_program.h" #include "brw_dead_control_flow.h" +#include "intel_debug.h" #include "compiler/glsl_types.h" #include "compiler/nir/nir_builder.h" #include "program/prog_parameter.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs_builder.h b/src/mesa/drivers/dri/i965/brw_fs_builder.h index e8cbb9c595b..87394bc17b3 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_builder.h +++ b/src/mesa/drivers/dri/i965/brw_fs_builder.h @@ -27,7 +27,6 @@ #include "brw_ir_fs.h" #include "brw_shader.h" -#include "brw_context.h" namespace brw { /** diff --git a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.h b/src/mesa/drivers/dri/i965/brw_fs_surface_builder.h index 17318ce2aff..32b56d387f6 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.h +++ b/src/mesa/drivers/dri/i965/brw_fs_surface_builder.h @@ -26,7 +26,6 @@ #define BRW_FS_SURFACE_BUILDER_H #include "brw_fs_builder.h" -#include "brw_context.h" namespace brw { namespace surface_access { diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index 299620311a5..412ea97dc09 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -29,7 +29,6 @@ #include "brw_gs.h" #include "brw_context.h" -#include "brw_vec4_gs_visitor.h" #include "brw_state.h" #include "brw_ff_gs.h" #include "brw_nir.h" diff --git a/src/mesa/drivers/dri/i965/brw_inst.h b/src/mesa/drivers/dri/i965/brw_inst.h index d6a2105710d..e73093eb8dd 100644 --- a/src/mesa/drivers/dri/i965/brw_inst.h +++ b/src/mesa/drivers/dri/i965/brw_inst.h @@ -33,7 +33,8 @@ #include -#include "brw_context.h" +#include "brw_defines.h" +#include "common/gen_device_info.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/drivers/dri/i965/brw_interpolation_map.c b/src/mesa/drivers/dri/i965/brw_interpolation_map.c index 8d53e5234a6..7b9f58eb6ee 100644 --- a/src/mesa/drivers/dri/i965/brw_interpolation_map.c +++ b/src/mesa/drivers/dri/i965/brw_interpolation_map.c @@ -22,7 +22,6 @@ */ #include "brw_compiler.h" -#include "brw_context.h" #include "compiler/nir/nir.h" static char const *get_qual_name(int mode) diff --git a/src/mesa/drivers/dri/i965/brw_ir_vec4.h b/src/mesa/drivers/dri/i965/brw_ir_vec4.h index 57fc6be8f89..bd026eb2aeb 100644 --- a/src/mesa/drivers/dri/i965/brw_ir_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_ir_vec4.h @@ -26,7 +26,6 @@ #define BRW_IR_VEC4_H #include "brw_shader.h" -#include "brw_context.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 261d8861c35..8611d485216 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -22,8 +22,6 @@ */ #include "brw_context.h" -#include "brw_shader.h" -#include "brw_fs.h" #include "brw_nir.h" #include "brw_program.h" #include "compiler/glsl/ir.h" diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 74703490c91..15e290a1e27 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -23,6 +23,7 @@ #include "brw_nir.h" #include "brw_shader.h" +#include "intel_debug.h" #include "compiler/glsl_types.h" #include "compiler/nir/nir_builder.h" diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 9ebd7d83d6c..024cf7914d1 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -21,8 +21,8 @@ * IN THE SOFTWARE. */ -#include "brw_shader.h" #include "brw_nir.h" +#include "brw_shader.h" #include "compiler/glsl/ir_uniform.h" static void diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 8f89849cb49..dbc39e53f2a 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -43,7 +43,6 @@ #include "brw_program.h" #include "brw_context.h" -#include "brw_shader.h" #include "brw_nir.h" #include "intel_batchbuffer.h" diff --git a/src/mesa/drivers/dri/i965/brw_program_cache.c b/src/mesa/drivers/dri/i965/brw_program_cache.c index a9a4c926207..0ff4683f34e 100644 --- a/src/mesa/drivers/dri/i965/brw_program_cache.c +++ b/src/mesa/drivers/dri/i965/brw_program_cache.c @@ -47,11 +47,11 @@ #include "main/imports.h" #include "intel_batchbuffer.h" #include "brw_state.h" -#include "brw_vs.h" #include "brw_wm.h" #include "brw_gs.h" #include "brw_cs.h" #include "brw_program.h" +#include "brw_eu.h" #define FILE_DEBUG_FLAG DEBUG_STATE diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c index 468050a651c..ff15c9755ff 100644 --- a/src/mesa/drivers/dri/i965/brw_sf.c +++ b/src/mesa/drivers/dri/i965/brw_sf.c @@ -39,7 +39,6 @@ #include "brw_defines.h" #include "brw_context.h" -#include "brw_eu.h" #include "brw_util.h" #include "brw_sf.h" #include "brw_state.h" diff --git a/src/mesa/drivers/dri/i965/brw_sf_emit.c b/src/mesa/drivers/dri/i965/brw_sf_emit.c index 5f31fa51602..dc905034a62 100644 --- a/src/mesa/drivers/dri/i965/brw_sf_emit.c +++ b/src/mesa/drivers/dri/i965/brw_sf_emit.c @@ -37,7 +37,6 @@ #include "brw_defines.h" #include "brw_context.h" -#include "brw_eu.h" #include "brw_util.h" #include "brw_sf.h" diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 53576da7773..7522a938ad6 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -21,13 +21,14 @@ * IN THE SOFTWARE. */ -#include "brw_context.h" #include "brw_cfg.h" #include "brw_eu.h" #include "brw_fs.h" #include "brw_nir.h" #include "brw_vec4_tes.h" +#include "intel_debug.h" #include "main/uniforms.h" +#include "util/macros.h" enum brw_reg_type brw_type_for_base_type(const struct glsl_type *type) diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h index 939a45aa7ef..5f53c74d826 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.h +++ b/src/mesa/drivers/dri/i965/brw_shader.h @@ -25,8 +25,9 @@ #include #include "brw_reg.h" +#include "brw_compiler.h" #include "brw_defines.h" -#include "brw_context.h" +#include "brw_inst.h" #include "compiler/nir/nir.h" #ifdef __cplusplus diff --git a/src/mesa/drivers/dri/i965/brw_state_dump.c b/src/mesa/drivers/dri/i965/brw_state_dump.c index 13e76ec9d83..bc9b9a352df 100644 --- a/src/mesa/drivers/dri/i965/brw_state_dump.c +++ b/src/mesa/drivers/dri/i965/brw_state_dump.c @@ -32,7 +32,6 @@ #include "brw_context.h" #include "brw_defines.h" -#include "brw_eu.h" #include "brw_state.h" static const char *sampler_mip_filter[] = { diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 52b74a7c527..b3bd0ce8cb4 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -33,6 +33,7 @@ #include "brw_context.h" #include "brw_state.h" +#include "brw_program.h" #include "drivers/common/meta.h" #include "intel_batchbuffer.h" #include "intel_buffers.h" diff --git a/src/mesa/drivers/dri/i965/brw_tcs.c b/src/mesa/drivers/dri/i965/brw_tcs.c index 64bfc40d4d1..2bef1beb962 100644 --- a/src/mesa/drivers/dri/i965/brw_tcs.c +++ b/src/mesa/drivers/dri/i965/brw_tcs.c @@ -30,7 +30,6 @@ #include "brw_context.h" #include "brw_nir.h" #include "brw_program.h" -#include "brw_shader.h" #include "brw_state.h" #include "program/prog_parameter.h" #include "nir_builder.h" diff --git a/src/mesa/drivers/dri/i965/brw_tes.c b/src/mesa/drivers/dri/i965/brw_tes.c index 3da53579ac0..8313d38443f 100644 --- a/src/mesa/drivers/dri/i965/brw_tes.c +++ b/src/mesa/drivers/dri/i965/brw_tes.c @@ -30,7 +30,6 @@ #include "brw_context.h" #include "brw_nir.h" #include "brw_program.h" -#include "brw_shader.h" #include "brw_state.h" #include "program/prog_parameter.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 14a4f8544fb..95199fbc799 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -29,6 +29,7 @@ #include "brw_vec4_live_variables.h" #include "brw_vec4_vs.h" #include "brw_dead_control_flow.h" +#include "intel_debug.h" #include "program/prog_parameter.h" #define MAX_INSTRUCTION (1 << 30) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_builder.h b/src/mesa/drivers/dri/i965/brw_vec4_builder.h index 8352542d498..4c3efe8457b 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_builder.h +++ b/src/mesa/drivers/dri/i965/brw_vec4_builder.h @@ -27,7 +27,6 @@ #include "brw_ir_vec4.h" #include "brw_ir_allocator.h" -#include "brw_context.h" namespace brw { /** diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp index b2ebdb39b98..83f5711c1b8 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -24,6 +24,7 @@ #include "brw_cfg.h" #include "brw_eu.h" #include "brw_program.h" +#include "intel_debug.h" using namespace brw; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp index 02200689897..3a8bc77531b 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp @@ -31,6 +31,7 @@ #include "gen6_gs_visitor.h" #include "brw_fs.h" #include "brw_nir.h" +#include "intel_debug.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp b/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp index 3ea90107f76..d27074c1312 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp @@ -30,6 +30,7 @@ #include "brw_nir.h" #include "brw_vec4_tcs.h" #include "brw_fs.h" +#include "intel_debug.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp b/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp index ae6d99bed83..0c05ab0c157 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp @@ -29,6 +29,7 @@ #include "brw_vec4_tes.h" #include "brw_cfg.h" +#include "intel_debug.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp index 2c1051c9098..a80a61bb4fa 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp @@ -23,7 +23,7 @@ #include "brw_vec4_vs.h" - +#include "intel_debug.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_vs.h b/src/mesa/drivers/dri/i965/brw_vs.h index 98b0bf18d90..6e052d73352 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.h +++ b/src/mesa/drivers/dri/i965/brw_vs.h @@ -33,8 +33,7 @@ #ifndef BRW_VS_H #define BRW_VS_H - -#include "brw_vec4.h" +#include "brw_context.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/drivers/dri/i965/brw_vue_map.c b/src/mesa/drivers/dri/i965/brw_vue_map.c index 178a4e5ee83..89120684cba 100644 --- a/src/mesa/drivers/dri/i965/brw_vue_map.c +++ b/src/mesa/drivers/dri/i965/brw_vue_map.c @@ -40,7 +40,8 @@ */ -#include "brw_context.h" +#include "brw_compiler.h" +#include "intel_debug.h" static inline void assign_vue_slot(struct brw_vue_map *vue_map, int varying, int slot) diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index dd3e20180af..c1f207e9518 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -26,7 +26,6 @@ #include "brw_context.h" #include "brw_wm.h" #include "brw_state.h" -#include "brw_shader.h" #include "main/enums.h" #include "main/formats.h" #include "main/fbobject.h" diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h index d1bf868061e..613172a40e2 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.h +++ b/src/mesa/drivers/dri/i965/brw_wm.h @@ -36,7 +36,6 @@ #include #include "brw_context.h" -#include "brw_eu.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c index bae4fd2fa64..dc3cc66407a 100644 --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c @@ -23,10 +23,9 @@ #include "util/ralloc.h" #include "brw_context.h" +#include "brw_defines.h" #include "brw_cs.h" -#include "brw_eu.h" #include "brw_wm.h" -#include "brw_shader.h" #include "intel_mipmap_tree.h" #include "intel_batchbuffer.h" #include "brw_state.h" diff --git a/src/mesa/drivers/dri/i965/intel_debug.h b/src/mesa/drivers/dri/i965/intel_debug.h index e8e329bc60d..8c81c1d3069 100644 --- a/src/mesa/drivers/dri/i965/intel_debug.h +++ b/src/mesa/drivers/dri/i965/intel_debug.h @@ -24,6 +24,9 @@ */ #pragma once +#include +#include "compiler/shader_enums.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index d6a88a149f5..f98431f8669 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -35,7 +35,7 @@ #include "main/version.h" #include "swrast/s_renderbuffer.h" #include "util/ralloc.h" -#include "brw_shader.h" +#include "brw_defines.h" #include "compiler/nir/nir.h" #include "utils.h" diff --git a/src/mesa/drivers/dri/i965/test_eu_compact.c b/src/mesa/drivers/dri/i965/test_eu_compact.c index 874412cd3c3..d7453613b6e 100644 --- a/src/mesa/drivers/dri/i965/test_eu_compact.c +++ b/src/mesa/drivers/dri/i965/test_eu_compact.c @@ -25,7 +25,6 @@ #include #include #include "util/ralloc.h" -#include "brw_context.h" #include "brw_eu.h" static bool diff --git a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp b/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp index b0eaf5c6625..f4f91d8c8c7 100644 --- a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp +++ b/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp @@ -23,7 +23,6 @@ #include #include "brw_vec4.h" -#include "brw_vs.h" #include "program/program.h" using namespace brw; diff --git a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp index 81d17356676..a3dbb0a72e4 100644 --- a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp +++ b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp @@ -23,7 +23,6 @@ #include #include "brw_vec4.h" -#include "brw_vs.h" #include "program/program.h" using namespace brw; -- 2.30.2