From ecac1aab538d65f0867fd93e23d0d020c1a5d0f1 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 22 Nov 2015 15:30:59 -0800 Subject: [PATCH] i965: Push down inclusion of brw_program.h. We were including it in headers, which then caused it to be included in tons of places it wasn't needed. Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/brw_cs.c | 1 + src/mesa/drivers/dri/i965/brw_cs.h | 2 -- src/mesa/drivers/dri/i965/brw_fs.cpp | 1 + src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 1 + src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 1 + src/mesa/drivers/dri/i965/brw_gs.c | 1 + src/mesa/drivers/dri/i965/brw_gs.h | 1 - src/mesa/drivers/dri/i965/brw_link.cpp | 1 + src/mesa/drivers/dri/i965/brw_program.c | 1 + src/mesa/drivers/dri/i965/brw_program.h | 2 ++ src/mesa/drivers/dri/i965/brw_state_cache.c | 1 + src/mesa/drivers/dri/i965/brw_vec4.h | 1 - src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4_nir.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 1 + src/mesa/drivers/dri/i965/brw_vs.c | 1 + src/mesa/drivers/dri/i965/brw_wm.c | 1 + src/mesa/drivers/dri/i965/brw_wm.h | 1 - 18 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c index 263d224e882..a34c32047ff 100644 --- a/src/mesa/drivers/dri/i965/brw_cs.c +++ b/src/mesa/drivers/dri/i965/brw_cs.c @@ -31,6 +31,7 @@ #include "brw_state.h" #include "intel_batchbuffer.h" #include "brw_nir.h" +#include "brw_program.h" static void assign_cs_binding_table_offsets(const struct brw_device_info *devinfo, diff --git a/src/mesa/drivers/dri/i965/brw_cs.h b/src/mesa/drivers/dri/i965/brw_cs.h index 899e340f14e..9ce39fb18ac 100644 --- a/src/mesa/drivers/dri/i965/brw_cs.h +++ b/src/mesa/drivers/dri/i965/brw_cs.h @@ -25,8 +25,6 @@ #ifndef BRW_CS_H #define BRW_CS_H -#include "brw_program.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 9ea6beb93c1..b052bb9a2cb 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -46,6 +46,7 @@ #include "brw_nir.h" #include "brw_vec4_gs_visitor.h" #include "brw_cfg.h" +#include "brw_program.h" #include "brw_dead_control_flow.h" #include "main/uniforms.h" #include "brw_fs_live_variables.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index 6493e053274..48cb13d2767 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -32,6 +32,7 @@ #include "brw_eu.h" #include "brw_fs.h" #include "brw_cfg.h" +#include "brw_program.h" static enum brw_reg_file brw_file_from_reg(fs_reg *reg) diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp index 1e39b398187..993367ec7e0 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp @@ -30,6 +30,7 @@ #include "brw_fs_surface_builder.h" #include "brw_vec4_gs_visitor.h" #include "brw_nir.h" +#include "brw_program.h" using namespace brw; using namespace brw::surface_access; diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index 149b43ba055..136be6837e4 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -33,6 +33,7 @@ #include "brw_state.h" #include "brw_ff_gs.h" #include "brw_nir.h" +#include "brw_program.h" static void assign_gs_binding_table_offsets(const struct brw_device_info *devinfo, diff --git a/src/mesa/drivers/dri/i965/brw_gs.h b/src/mesa/drivers/dri/i965/brw_gs.h index 0c49bb688d4..13d6be8029b 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.h +++ b/src/mesa/drivers/dri/i965/brw_gs.h @@ -27,7 +27,6 @@ #include #include "brw_context.h" -#include "brw_program.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index b3a97476ec6..db0c22e3283 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -28,6 +28,7 @@ #include "brw_fs.h" #include "brw_cfg.h" #include "brw_nir.h" +#include "brw_program.h" #include "glsl/ir_optimization.h" #include "glsl/glsl_parser_extras.h" #include "main/shaderapi.h" diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index f137c8735fb..0c7692e8867 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -41,6 +41,7 @@ #include "util/ralloc.h" #include "glsl/ir.h" +#include "brw_program.h" #include "brw_context.h" #include "brw_shader.h" #include "brw_nir.h" diff --git a/src/mesa/drivers/dri/i965/brw_program.h b/src/mesa/drivers/dri/i965/brw_program.h index f8cf2b062c8..339b8e19ec5 100644 --- a/src/mesa/drivers/dri/i965/brw_program.h +++ b/src/mesa/drivers/dri/i965/brw_program.h @@ -30,6 +30,8 @@ extern "C" { #endif +struct brw_context; + void brw_setup_tex_for_precompile(struct brw_context *brw, struct brw_sampler_prog_key_data *tex, struct gl_program *prog); diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_state_cache.c index f7c0a2037d9..cac06fa8918 100644 --- a/src/mesa/drivers/dri/i965/brw_state_cache.c +++ b/src/mesa/drivers/dri/i965/brw_state_cache.c @@ -51,6 +51,7 @@ #include "brw_wm.h" #include "brw_gs.h" #include "brw_cs.h" +#include "brw_program.h" #define FILE_DEBUG_FLAG DEBUG_STATE diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 3f674326284..0754bc7f17b 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -28,7 +28,6 @@ #include "brw_shader.h" #include "main/compiler.h" #include "program/hash_table.h" -#include "brw_program.h" #ifdef __cplusplus #include "brw_ir_vec4.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp index c06fb218aee..eeb7a8abe36 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -23,6 +23,7 @@ #include "glsl/glsl_parser_extras.h" #include "brw_vec4.h" #include "brw_cfg.h" +#include "brw_program.h" using namespace brw; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp index c777acf70a7..05de9724423 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp @@ -25,6 +25,7 @@ #include "brw_vec4.h" #include "brw_vec4_builder.h" #include "brw_vec4_surface_builder.h" +#include "brw_program.h" #include "glsl/ir_uniform.h" using namespace brw; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 04ea1775ceb..cb92b4f1060 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -23,6 +23,7 @@ #include "brw_vec4.h" #include "brw_cfg.h" +#include "brw_program.h" #include "glsl/ir_uniform.h" #include "program/sampler.h" diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index 7c783f66864..d45347f7c1d 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -39,6 +39,7 @@ #include "program/prog_print.h" #include "program/prog_parameter.h" #include "brw_nir.h" +#include "brw_program.h" #include "util/ralloc.h" diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 8d9ed3a6c33..5d0fe82ebf6 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -36,6 +36,7 @@ #include "program/program.h" #include "intel_mipmap_tree.h" #include "brw_nir.h" +#include "brw_program.h" #include "util/ralloc.h" diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h index 53a642ee8bb..35dfa4c1176 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.h +++ b/src/mesa/drivers/dri/i965/brw_wm.h @@ -38,7 +38,6 @@ #include "program/prog_instruction.h" #include "brw_context.h" #include "brw_eu.h" -#include "brw_program.h" /* A big lookup table is used to figure out which and how many * additional regs will inserted before the main payload in the WM -- 2.30.2