diff options
| author | Francisco Jerez <[email protected]> | 2016-03-09 17:06:50 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2020-03-06 10:20:28 -0800 |
| commit | 27ae3c1f684fe64e47f7a6cd374dc156f15847e0 (patch) | |
| tree | 52ff1a685d78a1ab7dbfa52db29fa894cbb05f21 /src | |
| parent | a6fc88e91bdf9e235aa8a0a0f69f219c051cb1af (diff) | |
intel/compiler: Reverse inclusion dependency between brw_vec4_live_variables.h and brw_vec4.h
brw_vec4.h (in particular vec4_visitor) is logically a user of the
live variables analysis pass, not the other way around.
brw_vec4_live_variables.h requires the definition of some VEC4 IR data
structures to compile, but those can be obtained directly from
brw_ir_vec4.h without including brw_vec4.h.
Reviewed-by: Matt Turner <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4012>
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel/compiler/brw_vec4.cpp | 1 | ||||
| -rw-r--r-- | src/intel/compiler/brw_vec4.h | 4 | ||||
| -rw-r--r-- | src/intel/compiler/brw_vec4_live_variables.cpp | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_vec4_live_variables.h | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/intel/compiler/brw_vec4.cpp b/src/intel/compiler/brw_vec4.cpp index fb4cf365cb4..b6246d7742a 100644 --- a/src/intel/compiler/brw_vec4.cpp +++ b/src/intel/compiler/brw_vec4.cpp @@ -26,7 +26,6 @@ #include "brw_cfg.h" #include "brw_nir.h" #include "brw_vec4_builder.h" -#include "brw_vec4_live_variables.h" #include "brw_vec4_vs.h" #include "brw_dead_control_flow.h" #include "dev/gen_debug.h" diff --git a/src/intel/compiler/brw_vec4.h b/src/intel/compiler/brw_vec4.h index a3831c6e1bd..e014e73995b 100644 --- a/src/intel/compiler/brw_vec4.h +++ b/src/intel/compiler/brw_vec4.h @@ -29,6 +29,7 @@ #ifdef __cplusplus #include "brw_ir_vec4.h" #include "brw_vec4_builder.h" +#include "brw_vec4_live_variables.h" #endif #include "compiler/glsl/ir.h" @@ -52,9 +53,6 @@ brw_vec4_generate_assembly(const struct brw_compiler *compiler, } /* extern "C" */ namespace brw { - -class vec4_live_variables; - /** * The vertex shader front-end. * diff --git a/src/intel/compiler/brw_vec4_live_variables.cpp b/src/intel/compiler/brw_vec4_live_variables.cpp index 5e3ab6c29e7..74d0f3bd028 100644 --- a/src/intel/compiler/brw_vec4_live_variables.cpp +++ b/src/intel/compiler/brw_vec4_live_variables.cpp @@ -25,7 +25,7 @@ * */ -#include "brw_cfg.h" +#include "brw_vec4.h" #include "brw_vec4_live_variables.h" using namespace brw; diff --git a/src/intel/compiler/brw_vec4_live_variables.h b/src/intel/compiler/brw_vec4_live_variables.h index a86f4f48dff..16eb258d7b4 100644 --- a/src/intel/compiler/brw_vec4_live_variables.h +++ b/src/intel/compiler/brw_vec4_live_variables.h @@ -28,8 +28,8 @@ #ifndef BRW_VEC4_LIVE_VARIABLES_H #define BRW_VEC4_LIVE_VARIABLES_H +#include "brw_ir_vec4.h" #include "util/bitset.h" -#include "brw_vec4.h" namespace brw { |