diff options
| author | Connor Abbott <[email protected]> | 2020-06-24 12:02:56 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-06-26 09:34:33 +0000 |
| commit | 4554b946c387ac38acade14d006b2b599a08f446 (patch) | |
| tree | d697c9a917abbf53351809b6bc5e73cbbf422b16 /src/freedreno | |
| parent | 2841bb1fac81c32b736f593507d46c46e7488f68 (diff) | |
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>
Diffstat (limited to 'src/freedreno')
| -rw-r--r-- | src/freedreno/ir3/ir3.c | 2 | ||||
| -rw-r--r-- | src/freedreno/ir3/ir3_assembler.c | 2 | ||||
| -rw-r--r-- | src/freedreno/ir3/ir3_compiler.h | 3 | ||||
| -rw-r--r-- | src/freedreno/ir3/ir3_legalize.c | 2 | ||||
| -rw-r--r-- | src/freedreno/ir3/ir3_ra.c | 2 | ||||
| -rw-r--r-- | src/freedreno/ir3/ir3_shader.h | 2 | ||||
| -rw-r--r-- | src/freedreno/ir3/tests/delay.c | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/src/freedreno/ir3/ir3.c b/src/freedreno/ir3/ir3.c index 7b1b3043818..8b34418828c 100644 --- 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 6dee9475da5..414e6884c0c 100644 --- 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 b777edf6311..68813c66fdb 100644 --- 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 01cf1d59895..c4d90c15ba9 100644 --- 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 254de0a7b2f..441a6eb7ce9 100644 --- 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 2529de73509..353ce22b243 100644 --- 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 4e4d1cc00a0..5d654e32cc9 100644 --- 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 |