Module: Mesa Branch: master Commit: c4e99500f4be87997e9348d32a452e2f191b0cbf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4e99500f4be87997e9348d32a452e2f191b0cbf
Author: Vinson Lee <[email protected]> Date: Sun Aug 15 00:59:34 2010 -0700 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. --- src/mesa/slang/slang_label.c | 2 ++ src/mesa/slang/slang_label.h | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mesa/slang/slang_label.c b/src/mesa/slang/slang_label.c index 8e3a8eb..24881d5 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 4d04df1..b0cff3a 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_ { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
