Mesa (master): st/mesa: Clean up header file inclusion in st_mesa_to_tgsi.h .

Vinson Lee vlee at kemper.freedesktop.org
Thu Aug 5 17:15:40 PDT 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Thu Aug  5 17:13:15 2010 -0700

st/mesa: Clean up header file inclusion in st_mesa_to_tgsi.h.

st_mesa_to_tgsi.h
Replace tgsi_ureg.h with a forward declaration.
Include p_compiler.h for ubyte symbol.

st_program.c
Include tgsi_ureg.h directly.

---

 src/mesa/state_tracker/st_mesa_to_tgsi.h |    4 +++-
 src/mesa/state_tracker/st_program.c      |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.h b/src/mesa/state_tracker/st_mesa_to_tgsi.h
index e3c5bd1..ca076ce 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.h
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.h
@@ -30,8 +30,10 @@
 #define ST_MESA_TO_TGSI_H
 
 #include "main/mtypes.h"
-#include "tgsi/tgsi_ureg.h"
 
+#include "pipe/p_compiler.h"
+
+struct ureg_program;
 
 #if defined __cplusplus
 extern "C" {
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 6f3ecdb..91528c2 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -41,6 +41,7 @@
 #include "pipe/p_shader_tokens.h"
 #include "draw/draw_context.h"
 #include "tgsi/tgsi_dump.h"
+#include "tgsi/tgsi_ureg.h"
 
 #include "st_debug.h"
 #include "st_context.h"



More information about the mesa-commit mailing list