summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2015-02-11 15:08:02 -0800
committerEric Anholt <eric@anholt.net>2015-02-20 11:36:34 -0800
commitbef38f62e026c5bce5073f82f2797151f941b586 (patch)
treef5d25f80d3d7793453919bd706dee50401eb6d2e /src/glsl
parent90b4bf2e6e1289442331f0368221fde69b60915f (diff)
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 <cwabbott0@gmail.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/nir/nir.h4
-rw-r--r--src/glsl/nir/nir_lower_atomics.c1
-rw-r--r--src/glsl/nir/nir_lower_system_values.c1
3 files changed, 5 insertions, 1 deletions
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 <stdio.h>
@@ -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 <assert.h>
/*
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)