From 7784b3c846b46f0e94246f50b2d596984d6adf2d Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 7 Mar 2017 18:38:34 +0000 Subject: [PATCH] i965: remove unused brw_program.h include Neither of the changed files requires the brw_program.h include. Since we're about to move them [to src/intel/compiler] with the next commit there's no point in having the include. Let alone the very confusing compiler include directive [-I${top_srcdir}/src/mesa/drivers/dri/i965/] that one would have to use. Signed-off-by: Emil Velikov Reviewed-by: Jason Ekstrand --- 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_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 - 7 files changed, 7 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 2eefe00801b..c410efc29d6 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -34,7 +34,6 @@ #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 "common/gen_debug.h" #include "compiler/glsl_types.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index 65c75e63d27..aeed6a11977 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -30,7 +30,6 @@ #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 3d5967aaec2..d403dec5357 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp @@ -25,7 +25,6 @@ #include "brw_fs.h" #include "brw_fs_surface_builder.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_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 29b203af89e..a84048d8c6a 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -25,7 +25,6 @@ #define BRW_VEC4_H #include "brw_shader.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 abf522a782d..2ac287f17fa 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -23,7 +23,6 @@ #include "brw_vec4.h" #include "brw_cfg.h" #include "brw_eu.h" -#include "brw_program.h" #include "common/gen_debug.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 a7f048a0f8f..4e88b795049 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp @@ -25,7 +25,6 @@ #include "brw_vec4.h" #include "brw_vec4_builder.h" #include "brw_vec4_surface_builder.h" -#include "brw_program.h" using namespace brw; using namespace brw::surface_access; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index f376618b3cd..262a084ca87 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -24,7 +24,6 @@ #include "brw_vec4.h" #include "brw_cfg.h" #include "brw_eu.h" -#include "brw_program.h" namespace brw { -- 2.30.2