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

Vinson Lee vlee at kemper.freedesktop.org
Sat Aug 14 23:41:50 PDT 2010


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

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

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

Remove imports.h.
Remove mtypes.h.
Remove slang_compile.h.
Include glheader.h for GL symbols.
Include slang_vartable.h for slang_var_table symbol.

---

 src/mesa/slang/slang_emit.h |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mesa/slang/slang_emit.h b/src/mesa/slang/slang_emit.h
index ab4c202..f93d6b0 100644
--- a/src/mesa/slang/slang_emit.h
+++ b/src/mesa/slang/slang_emit.h
@@ -25,11 +25,9 @@
 #ifndef SLANG_EMIT_H
 #define SLANG_EMIT_H
 
-
-#include "main/imports.h"
-#include "slang_compile.h"
+#include "main/glheader.h"
 #include "slang_ir.h"
-#include "main/mtypes.h"
+#include "slang_vartable.h"
 
 
 extern GLuint



More information about the mesa-commit mailing list