Mesa (master): glsl: Clean up header file inclusion in slang_compile.h.

Vinson Lee vlee at kemper.freedesktop.org
Sun Aug 15 06:33:36 UTC 2010


Module: Mesa
Branch: master
Commit: 0ef5449832c53f79477672a8b8cbfce212a1eea4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ef5449832c53f79477672a8b8cbfce212a1eea4

Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Aug 14 23:32:08 2010 -0700

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

Remove imports.h.
Remove slang_typeinfo.h.
Remove slang_compile_operation.h.
Include glheader.h for GL symbols.
Include slang_utility.h for slang_atom_pool symbol.

---

 src/mesa/slang/slang_compile.h |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/mesa/slang/slang_compile.h b/src/mesa/slang/slang_compile.h
index 71fcaa3..6061f87 100644
--- a/src/mesa/slang/slang_compile.h
+++ b/src/mesa/slang/slang_compile.h
@@ -25,13 +25,14 @@
 #if !defined SLANG_COMPILE_H
 #define SLANG_COMPILE_H
 
-#include "main/imports.h"
+#include "main/glheader.h"
 #include "main/mtypes.h"
-#include "slang_typeinfo.h"
-#include "slang_compile_variable.h"
-#include "slang_compile_struct.h"
-#include "slang_compile_operation.h"
 #include "slang_compile_function.h"
+#include "slang_compile_struct.h"
+#include "slang_compile_variable.h"
+#include "slang_utility.h"
+
+struct slang_code_object_;
 
 #if defined __cplusplus
 extern "C" {




More information about the mesa-commit mailing list