intel/compiler: Reverse inclusion dependency between brw_cfg.h and brw_shader.h

This reflects the natural dependency relationship between brw_cfg.h
and brw_shader.h.  brw_cfg.h only requires the base IR definitions
which are now part of a separate header.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4012>

diff --git a/src/intel/compiler/brw_cfg.cpp b/src/intel/compiler/brw_cfg.cpp
index 87a423d998f81911e6ab5178acf61a9c82d99694..0432bd290ab2e6342bdaee5ee49d7593073c1977 100644 (file)
--- a/src/intel/compiler/brw_cfg.cpp
+++ b/src/intel/compiler/brw_cfg.cpp
@@ -26,6 +26,7 @@
  */
 
 #include "brw_cfg.h"
+#include "brw_shader.h"
 
 /** @file brw_cfg.cpp
  *

diff --git a/src/intel/compiler/brw_cfg.h b/src/intel/compiler/brw_cfg.h
index 7434b190660a456be61157f90fd66a79aeadf8be..851674a69fe538b96b1992f6c8db2844dda6ec7f 100644 (file)
--- a/src/intel/compiler/brw_cfg.h
+++ b/src/intel/compiler/brw_cfg.h
@@ -28,7 +28,7 @@
 #ifndef BRW_CFG_H
 #define BRW_CFG_H
 
-#include "brw_shader.h"
+#include "brw_ir.h"
 
 struct bblock_t;
 
@@ -70,7 +70,8 @@ struct bblock_link {
    enum bblock_link_kind kind;
 };
 
-struct backend_instruction;
+struct backend_shader;
+struct cfg_t;
 
 struct bblock_t {
 #ifdef __cplusplus

diff --git a/src/intel/compiler/brw_predicated_break.cpp b/src/intel/compiler/brw_predicated_break.cpp
index 0dcb5e50b7325a4f909b5d1b785ef7ff1840add4..df352a64871b08efa17cb891c649be5a90f370c4 100644 (file)
--- a/src/intel/compiler/brw_predicated_break.cpp
+++ b/src/intel/compiler/brw_predicated_break.cpp
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_cfg.h"
+#include "brw_shader.h"
 
 using namespace brw;
 

diff --git a/src/intel/compiler/brw_shader.h b/src/intel/compiler/brw_shader.h
index ebf6c2f3674dd48d2ab1e3e1590e27118282d170..4455f07907168c90d7af0e3bf05ba78723113365 100644 (file)
--- a/src/intel/compiler/brw_shader.h
+++ b/src/intel/compiler/brw_shader.h
@@ -25,12 +25,10 @@
 #define BRW_SHADER_H
 
 #include <stdint.h>
-#include "brw_ir.h"
+#include "brw_cfg.h"
 #include "brw_compiler.h"
 #include "compiler/nir/nir.h"
 
-struct cfg_t;
-
 #ifdef __cplusplus
 #include "brw_ir_allocator.h"