From 9105cf19558af9da2184a35ad7258ea3a7bc14dd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 7 Dec 2021 16:41:19 +1000
Subject: [PATCH] intel/compiler: drop shader_info.h from compiler header

include it explicitly in the correct places

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14104>
---
 src/gallium/drivers/crocus/crocus_draw.c  | 1 +
 src/gallium/drivers/crocus/crocus_state.c | 1 +
 src/gallium/drivers/iris/iris_draw.c      | 1 +
 src/gallium/drivers/iris/iris_measure.c   | 1 +
 src/intel/compiler/brw_compiler.h         | 2 +-
 src/intel/compiler/brw_eu.h               | 2 ++
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/crocus/crocus_draw.c b/src/gallium/drivers/crocus/crocus_draw.c
index 558083045af..b576ba8284e 100644
--- a/src/gallium/drivers/crocus/crocus_draw.c
+++ b/src/gallium/drivers/crocus/crocus_draw.c
@@ -38,6 +38,7 @@
 #include "util/u_upload_mgr.h"
 #include "intel/compiler/brw_compiler.h"
 #include "intel/compiler/brw_eu_defines.h"
+#include "compiler/shader_info.h"
 #include "crocus_context.h"
 #include "crocus_defines.h"
 #include "util/u_prim_restart.h"
diff --git a/src/gallium/drivers/crocus/crocus_state.c b/src/gallium/drivers/crocus/crocus_state.c
index c54fb7e48b8..34b3755cd41 100644
--- a/src/gallium/drivers/crocus/crocus_state.c
+++ b/src/gallium/drivers/crocus/crocus_state.c
@@ -88,6 +88,7 @@
 #include "intel/common/intel_l3_config.h"
 #include "intel/common/intel_sample_positions.h"
 #include "intel/compiler/brw_compiler.h"
+#include "compiler/shader_info.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
diff --git a/src/gallium/drivers/iris/iris_draw.c b/src/gallium/drivers/iris/iris_draw.c
index a788112232a..68b6465023a 100644
--- a/src/gallium/drivers/iris/iris_draw.c
+++ b/src/gallium/drivers/iris/iris_draw.c
@@ -38,6 +38,7 @@
 #include "util/u_upload_mgr.h"
 #include "intel/compiler/brw_compiler.h"
 #include "intel/compiler/brw_eu_defines.h"
+#include "compiler/shader_info.h"
 #include "iris_context.h"
 #include "iris_defines.h"
 
diff --git a/src/gallium/drivers/iris/iris_measure.c b/src/gallium/drivers/iris/iris_measure.c
index 620cc06fcd4..930d7ab9ef3 100644
--- a/src/gallium/drivers/iris/iris_measure.c
+++ b/src/gallium/drivers/iris/iris_measure.c
@@ -30,6 +30,7 @@
 #include "util/crc32.h"
 #include "iris_context.h"
 #include "iris_defines.h"
+#include "compiler/shader_info.h"
 
 void
 iris_init_screen_measure(struct iris_screen *screen)
diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index 2fd94315d1f..63fe7d9944b 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -30,7 +30,6 @@
 #include "main/macros.h"
 #include "main/config.h"
 #include "util/ralloc.h"
-#include "compiler/shader_info.h"
 #include "util/u_math.h"
 
 #ifdef __cplusplus
@@ -40,6 +39,7 @@ extern "C" {
 struct ra_regs;
 struct nir_shader;
 struct brw_program;
+struct shader_info;
 
 struct nir_shader_compiler_options;
 typedef struct nir_shader nir_shader;
diff --git a/src/intel/compiler/brw_eu.h b/src/intel/compiler/brw_eu.h
index 7d240590d0d..0244e505229 100644
--- a/src/intel/compiler/brw_eu.h
+++ b/src/intel/compiler/brw_eu.h
@@ -41,6 +41,8 @@
 #include "brw_reg.h"
 #include "brw_disasm_info.h"
 
+#include "util/bitset.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif