From 310aef6b590d3d129b285ff8c50565af8cebacbc Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Wed, 9 Mar 2016 15:38:55 -0800
Subject: [PATCH] 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>
---
 src/intel/compiler/brw_cfg.cpp              | 1 +
 src/intel/compiler/brw_cfg.h                | 5 +++--
 src/intel/compiler/brw_predicated_break.cpp | 2 +-
 src/intel/compiler/brw_shader.h             | 4 +---
 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"
 
-- 
2.30.2