aboutsummaryrefslogtreecommitdiffstats
path: root/src/intel/compiler
diff options
context:
space:
mode:
authorFrancisco Jerez <[email protected]>2016-03-09 15:38:55 -0800
committerMatt Turner <[email protected]>2020-03-06 10:20:19 -0800
commit310aef6b590d3d129b285ff8c50565af8cebacbc (patch)
treedefd6700ab0411fa07a96f3debcf81b159254242 /src/intel/compiler
parentd46fb2126d9fdd52386b001a140c1b70fec83f9e (diff)
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 <[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_cfg.cpp1
-rw-r--r--src/intel/compiler/brw_cfg.h5
-rw-r--r--src/intel/compiler/brw_predicated_break.cpp2
-rw-r--r--src/intel/compiler/brw_shader.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/intel/compiler/brw_cfg.cpp b/src/intel/compiler/brw_cfg.cpp
index 87a423d998f..0432bd290ab 100644
--- 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 7434b190660..851674a69fe 100644
--- 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 0dcb5e50b73..df352a64871 100644
--- 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 ebf6c2f3674..4455f079071 100644
--- 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"