From bef38f62e026c5bce5073f82f2797151f941b586 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 11 Feb 2015 15:08:02 -0800 Subject: [PATCH] nir: Drop dependency on mtypes.h for core NIR. One less new directory necessary for gallium code that wants to interact with NIR. Reviewed-by: Connor Abbott Reviewed-by: Jose Fonseca --- src/glsl/nir/nir.h | 4 +++- src/glsl/nir/nir_lower_atomics.c | 1 + src/glsl/nir/nir_lower_system_values.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h index 17b8b4b97c9..d74caa959cc 100644 --- a/src/glsl/nir/nir.h +++ b/src/glsl/nir/nir.h @@ -32,7 +32,6 @@ #include "GL/gl.h" /* GLenum */ #include "util/ralloc.h" #include "util/set.h" -#include "main/mtypes.h" #include "util/bitset.h" #include "nir_types.h" #include @@ -43,6 +42,9 @@ extern "C" { #endif +struct gl_program; +struct gl_shader_program; + #define NIR_FALSE 0u #define NIR_TRUE (~0u) diff --git a/src/glsl/nir/nir_lower_atomics.c b/src/glsl/nir/nir_lower_atomics.c index 5e04417c0f3..e82df016969 100644 --- a/src/glsl/nir/nir_lower_atomics.c +++ b/src/glsl/nir/nir_lower_atomics.c @@ -26,6 +26,7 @@ */ #include "nir.h" +#include "main/config.h" #include /* diff --git a/src/glsl/nir/nir_lower_system_values.c b/src/glsl/nir/nir_lower_system_values.c index 90346c975c1..328d4f1abc0 100644 --- a/src/glsl/nir/nir_lower_system_values.c +++ b/src/glsl/nir/nir_lower_system_values.c @@ -26,6 +26,7 @@ */ #include "nir.h" +#include "main/mtypes.h" static void convert_instr(nir_intrinsic_instr *instr) -- 2.30.2