diff options
| author | Vinson Lee <vlee@vmware.com> | 2010-08-05 18:21:09 -0700 |
|---|---|---|
| committer | Vinson Lee <vlee@vmware.com> | 2010-08-05 18:21:09 -0700 |
| commit | f717fd25cc44d7dda5a49dc05337c7ee7c8d2d2f (patch) | |
| tree | bdda72daeb6f624a21da48e78fe8a6105521bab1 | |
| parent | 4d10ec4f18cfb6c386feb65805713584ff730652 (diff) | |
st/mesa: Clean up header file inclusion in st_program.h.
st_program.h
Remove p_shader_tokens.h
Include st_context.h for st_context symbol.
Include p_state.h for PIPE_MAX_SHADER_INPUTS symbol.
Remove unnecessary forward declarations.
st_cb_bitmap.c
st_cb_clear.c
Include p_shader_tokens.h now that st_program.h doesn't include it.
| -rw-r--r-- | src/mesa/state_tracker/st_cb_bitmap.c | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_clear.c | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_program.h | 7 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c index ba600ccef6..0b8ecd27cb 100644 --- a/src/mesa/state_tracker/st_cb_bitmap.c +++ b/src/mesa/state_tracker/st_cb_bitmap.c @@ -46,6 +46,7 @@ #include "pipe/p_context.h" #include "pipe/p_defines.h" +#include "pipe/p_shader_tokens.h" #include "util/u_inlines.h" #include "util/u_draw_quad.h" #include "util/u_simple_shaders.h" diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c index ea2414c4a0..246ab2e957 100644 --- a/src/mesa/state_tracker/st_cb_clear.c +++ b/src/mesa/state_tracker/st_cb_clear.c @@ -45,6 +45,7 @@ #include "st_program.h" #include "pipe/p_context.h" +#include "pipe/p_shader_tokens.h" #include "pipe/p_state.h" #include "pipe/p_defines.h" #include "util/u_format.h" diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index d779d5a6dd..3805b9a725 100644 --- a/src/mesa/state_tracker/st_program.h +++ b/src/mesa/state_tracker/st_program.h @@ -36,11 +36,8 @@ #include "main/mtypes.h" #include "program/program.h" -#include "pipe/p_shader_tokens.h" - - -struct cso_fragment_shader; -struct cso_vertex_shader; +#include "pipe/p_state.h" +#include "st_context.h" /** |