ir3: Include ir3_compiler from ir3_shader

I wanted to access the ir3_compiler from a small helper inside
ir3_shader.h, which currently isn't possible.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5607>

diff --git a/src/freedreno/ir3/ir3.c b/src/freedreno/ir3/ir3.c
index 7b1b304381897574cf733c8d0a9d916da2328cfb..8b34418828c0ca5a98cccd1ad59af122ca041c47 100644 (file)
--- a/src/freedreno/ir3/ir3.c
+++ b/src/freedreno/ir3/ir3.c
@@ -35,7 +35,7 @@
 #include "util/u_math.h"
 
 #include "instr-a3xx.h"
-#include "ir3_compiler.h"
+#include "ir3_shader.h"
 
 /* simple allocator to carve allocations out of an up-front allocated heap,
  * so that we can free everything easily in one shot.

diff --git a/src/freedreno/ir3/ir3_assembler.c b/src/freedreno/ir3/ir3_assembler.c
index 6dee9475da50482e285b81e7834b962a41e7fd23..414e6884c0c4f146cfc47c728c0409797a0dea58 100644 (file)
--- a/src/freedreno/ir3/ir3_assembler.c
+++ b/src/freedreno/ir3/ir3_assembler.c
@@ -24,7 +24,7 @@
 #include <err.h>
 
 #include "ir3_assembler.h"
-#include "ir3_compiler.h"
+#include "ir3_shader.h"
 #include "ir3_parser.h"
 
 /**

diff --git a/src/freedreno/ir3/ir3_compiler.h b/src/freedreno/ir3/ir3_compiler.h
index b777edf6311d90916ce7b9671c4a3209ece91211..68813c66fdbab6533762e68739afbed402ce177d 100644 (file)
--- a/src/freedreno/ir3/ir3_compiler.h
+++ b/src/freedreno/ir3/ir3_compiler.h
@@ -27,9 +27,10 @@
 #ifndef IR3_COMPILER_H_
 #define IR3_COMPILER_H_
 
-#include "ir3_shader.h"
+#include "ir3.h"
 
 struct ir3_ra_reg_set;
+struct ir3_shader;
 
 struct ir3_compiler {
        struct fd_device *dev;

diff --git a/src/freedreno/ir3/ir3_legalize.c b/src/freedreno/ir3/ir3_legalize.c
index 01cf1d598955f44e211b18b90b998e3d8e2e2685..c4d90c15ba94554d66b2b47e8ac0f923423438e9 100644 (file)
--- a/src/freedreno/ir3/ir3_legalize.c
+++ b/src/freedreno/ir3/ir3_legalize.c
@@ -28,7 +28,7 @@
 #include "util/u_math.h"
 
 #include "ir3.h"
-#include "ir3_compiler.h"
+#include "ir3_shader.h"
 
 /*
  * Legalize:

diff --git a/src/freedreno/ir3/ir3_ra.c b/src/freedreno/ir3/ir3_ra.c
index 254de0a7b2f3b6eabc28167424a0e9ebf49492bc..441a6eb7ce964e7cff733a4de4081f581827d286 100644 (file)
--- a/src/freedreno/ir3/ir3_ra.c
+++ b/src/freedreno/ir3/ir3_ra.c
@@ -30,7 +30,7 @@
 #include "util/bitset.h"
 
 #include "ir3.h"
-#include "ir3_compiler.h"
+#include "ir3_shader.h"
 #include "ir3_ra.h"
 
 

diff --git a/src/freedreno/ir3/ir3_shader.h b/src/freedreno/ir3/ir3_shader.h
index 2529de73509685dde277b3493f16c4ea9e0a9bed..353ce22b2435f359822033a694cd71c5b2d9ae7d 100644 (file)
--- a/src/freedreno/ir3/ir3_shader.h
+++ b/src/freedreno/ir3/ir3_shader.h
@@ -34,7 +34,7 @@
 #include "compiler/nir/nir.h"
 #include "util/bitscan.h"
 
-#include "ir3.h"
+#include "ir3_compiler.h"
 
 struct glsl_type;
 

diff --git a/src/freedreno/ir3/tests/delay.c b/src/freedreno/ir3/tests/delay.c
index 4e4d1cc00a084f5d6822a9ef0de6fac010482c7c..5d654e32cc90956c86ab07b3d10f2db9fa57fe3f 100644 (file)
--- a/src/freedreno/ir3/tests/delay.c
+++ b/src/freedreno/ir3/tests/delay.c
@@ -25,7 +25,7 @@
 
 #include "ir3.h"
 #include "ir3_assembler.h"
-#include "ir3_compiler.h"
+#include "ir3_shader.h"
 
 /*
  * A test for delay-slot calculation.  Each test specifies ir3 assembly