diff options
| author | Francisco Jerez <[email protected]> | 2016-03-09 17:03:57 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2020-03-06 10:20:26 -0800 |
| commit | a6fc88e91bdf9e235aa8a0a0f69f219c051cb1af (patch) | |
| tree | feaf4f78ecbbd61a11e851f371ca694bfb55509b /src/intel/compiler | |
| parent | 06c5c4964621268f2dedd63a614ff89f4307057b (diff) | |
intel/compiler: Reverse inclusion dependency between brw_fs_live_variables.h and brw_fs.h
brw_fs.h (in particular fs_visitor) is logically a user of the live
variables analysis pass, not the other way around.
brw_fs_live_variables.h requires the definition of some FS IR data
structures to compile, but those can be obtained directly from
brw_ir_fs.h without including brw_fs.h. The dependency of
fs_live_variables on fs_visitor is rather accidental and will be
removed in a future commit, a forward declaration is enough for the
moment.
Reviewed-by: Matt Turner <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4012>
Diffstat (limited to 'src/intel/compiler')
| -rw-r--r-- | src/intel/compiler/brw_fs.h | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_fs_live_variables.cpp | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_fs_live_variables.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h index 543e760b3fe..c4af8e9d709 100644 --- a/src/intel/compiler/brw_fs.h +++ b/src/intel/compiler/brw_fs.h @@ -31,6 +31,7 @@ #include "brw_shader.h" #include "brw_ir_fs.h" #include "brw_fs_builder.h" +#include "brw_fs_live_variables.h" #include "compiler/nir/nir.h" struct bblock_t; @@ -39,7 +40,6 @@ namespace { } namespace brw { - class fs_live_variables; } struct brw_gs_compile; diff --git a/src/intel/compiler/brw_fs_live_variables.cpp b/src/intel/compiler/brw_fs_live_variables.cpp index 1e3e83a7918..cd19f41eab4 100644 --- a/src/intel/compiler/brw_fs_live_variables.cpp +++ b/src/intel/compiler/brw_fs_live_variables.cpp @@ -25,7 +25,7 @@ * */ -#include "brw_cfg.h" +#include "brw_fs.h" #include "brw_fs_live_variables.h" using namespace brw; diff --git a/src/intel/compiler/brw_fs_live_variables.h b/src/intel/compiler/brw_fs_live_variables.h index d37901d6f8a..cdf48d00476 100644 --- a/src/intel/compiler/brw_fs_live_variables.h +++ b/src/intel/compiler/brw_fs_live_variables.h @@ -28,10 +28,11 @@ #ifndef BRW_FS_LIVE_VARIABLES_H #define BRW_FS_LIVE_VARIABLES_H -#include "brw_fs.h" +#include "brw_ir_fs.h" #include "util/bitset.h" struct cfg_t; +class fs_visitor; namespace brw { |