diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-26 10:13:02 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-26 10:13:02 -0600 |
| commit | d619cceea47dc3070ebb7f7ea4f8b6b31a672d38 (patch) | |
| tree | f8b8a9f3fdc3f17a43436af270b22754b1749d31 /src/mesa/drivers/dri/r200/r200_vertprog.c | |
| parent | 76f3b66e0489526694d6a39b4a6ac3b1c2bee100 (diff) | |
| parent | e71c34aaa173ca451fa02e526ead77758f7eeb74 (diff) | |
merge of glsl-compiler-1 branch
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_vertprog.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_vertprog.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c b/src/mesa/drivers/dri/r200/r200_vertprog.c index 4960d481d5..6089d617c6 100644 --- a/src/mesa/drivers/dri/r200/r200_vertprog.c +++ b/src/mesa/drivers/dri/r200/r200_vertprog.c @@ -34,14 +34,16 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "macros.h" #include "enums.h" #include "program.h" +#include "shader/prog_instruction.h" +#include "shader/prog_parameter.h" +#include "shader/prog_statevars.h" +#include "shader/programopt.h" +#include "tnl/tnl.h" #include "r200_context.h" #include "r200_vertprog.h" #include "r200_ioctl.h" #include "r200_tcl.h" -#include "program_instruction.h" -#include "programopt.h" -#include "tnl/tnl.h" #if SWIZZLE_X != VSF_IN_COMPONENT_X || \ SWIZZLE_Y != VSF_IN_COMPONENT_Y || \ @@ -462,7 +464,7 @@ static GLboolean r200_translate_vertex_program(GLcontext *ctx, struct r200_verte base e isn't directly available neither. */ if ((mesa_vp->Base.OutputsWritten & (1 << VERT_RESULT_FOGC)) && !vp->fogpidx) { struct gl_program_parameter_list *paramList; - GLint tokens[6] = { STATE_FOG_PARAMS, 0, 0, 0, 0, 0 }; + gl_state_index tokens[STATE_LENGTH] = { STATE_FOG_PARAMS, 0, 0, 0, 0 }; paramList = mesa_vp->Base.Parameters; vp->fogpidx = _mesa_add_state_reference(paramList, tokens); } |