glsl: Clean up header file inclusion in slang_mem.h.

slang_mem.h
Remove imports.h.
Include glheader.h for GL symbols.

slang_label.c
Include imports.h now that slang_mem.c does not include it.

diff --git a/src/mesa/slang/slang_label.c b/src/mesa/slang/slang_label.c
index 24881d5b6e699b98331ce9f0d43dc1c444d3eeca..a1611398008477f83c560ee7068f5126e2e0662a 100644 (file)
--- a/src/mesa/slang/slang_label.c
+++ b/src/mesa/slang/slang_label.c
@@ -7,6 +7,7 @@
  */
 
 
+#include "main/imports.h"
 #include "main/mtypes.h"
 #include "program/prog_instruction.h"
 #include "slang_label.h"

diff --git a/src/mesa/slang/slang_mem.h b/src/mesa/slang/slang_mem.h
index b5bfae24791ebc423ad96845dd18c8d2e8020fe3..0f06df3c0c03f01425e810785d9fb4822813b992 100644 (file)
--- a/src/mesa/slang/slang_mem.h
+++ b/src/mesa/slang/slang_mem.h
@@ -27,7 +27,7 @@
 #define SLANG_MEM_H
 
 
-#include "main/imports.h"
+#include "main/glheader.h"
 
 
 typedef struct slang_mempool_ slang_mempool;