summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2010-08-15 00:59:34 -0700
committerVinson Lee <[email protected]>2010-08-15 01:01:58 -0700
commitc4e99500f4be87997e9348d32a452e2f191b0cbf (patch)
treeedc3a9a16d70ac6cb6cdfd4c78d894a9b2ea42fb
parent6dfcff6b05f44ad4e338fac18ccd4d470c953b1e (diff)
glsl: Clean up header file inclusion in slang_label.h.
Move mtypes.h and prog_instruction.h to slang_label.c. Remove imports.h. Include glheader.h from GL symbols.
-rw-r--r--src/mesa/slang/slang_label.c2
-rw-r--r--src/mesa/slang/slang_label.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/slang/slang_label.c b/src/mesa/slang/slang_label.c
index 8e3a8ebc1aa..24881d5b6e6 100644
--- a/src/mesa/slang/slang_label.c
+++ b/src/mesa/slang/slang_label.c
@@ -7,6 +7,8 @@
*/
+#include "main/mtypes.h"
+#include "program/prog_instruction.h"
#include "slang_label.h"
#include "slang_mem.h"
diff --git a/src/mesa/slang/slang_label.h b/src/mesa/slang/slang_label.h
index 4d04df18d25..b0cff3a8e89 100644
--- a/src/mesa/slang/slang_label.h
+++ b/src/mesa/slang/slang_label.h
@@ -1,10 +1,9 @@
#ifndef SLANG_LABEL_H
#define SLANG_LABEL_H 1
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "program/prog_instruction.h"
+#include "main/glheader.h"
+struct gl_program;
struct slang_label_
{