diff options
author | Vinson Lee <[email protected]> | 2010-08-05 17:13:15 -0700 |
---|---|---|
committer | Vinson Lee <[email protected]> | 2010-08-05 17:15:25 -0700 |
commit | 1b8aa2176c4fc580cc31c57c7e50e7f39ef2cc04 (patch) | |
tree | d142f6847540096879a10dd752382586b907aa35 | |
parent | bf5ee5aa4f065b6e17a4cc9cd2e539c4290ff98c (diff) |
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.
-rw-r--r-- | src/mesa/state_tracker/st_mesa_to_tgsi.h | 4 | ||||
-rw-r--r-- | 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 e3c5bd1d94d..ca076ce3622 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 6f3ecdbce11..91528c227b2 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" |