diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-13 20:22:46 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-13 20:22:46 -0700 |
| commit | 443a7e4e9a360acbc3e662c098be436f180bf81d (patch) | |
| tree | 71125fc394bdcbc17cd7ed74c592b9a7761541f8 /src/mesa/state_tracker/st_program.h | |
| parent | 2f8ee757ab324d599fcb8287789eb5f1a7890d74 (diff) | |
| parent | 27041d7cb3faeaed483538a228573466363ec1c7 (diff) | |
Merge branch 'master' into glsl2
Diffstat (limited to 'src/mesa/state_tracker/st_program.h')
| -rw-r--r-- | src/mesa/state_tracker/st_program.h | 7 |
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" /** |