summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_program.h
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2010-08-05 18:21:09 -0700
committerVinson Lee <vlee@vmware.com>2010-08-05 18:21:09 -0700
commitf717fd25cc44d7dda5a49dc05337c7ee7c8d2d2f (patch)
treebdda72daeb6f624a21da48e78fe8a6105521bab1 /src/mesa/state_tracker/st_program.h
parent4d10ec4f18cfb6c386feb65805713584ff730652 (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.
Diffstat (limited to 'src/mesa/state_tracker/st_program.h')
-rw-r--r--src/mesa/state_tracker/st_program.h7
1 files changed, 2 insertions, 5 deletions
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"
/**