diff options
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_fragprog.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_fragprog.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c index e01f56d99d..26b09b4db2 100644 --- a/src/mesa/drivers/dri/r300/r300_fragprog.c +++ b/src/mesa/drivers/dri/r300/r300_fragprog.c @@ -43,9 +43,10 @@ #include "glheader.h" #include "macros.h" #include "enums.h" +#include "shader/prog_instruction.h" +#include "shader/prog_parameter.h" +#include "shader/prog_print.h" -#include "program.h" -#include "program_instruction.h" #include "r300_context.h" #include "r300_fragprog.h" #include "r300_reg.h" @@ -948,7 +949,9 @@ static void emit_tex(struct r300_fragment_program *rp, * \todo Refactor this once we have proper rewriting/optimization * support for programs. */ - GLint tokens[6] = { STATE_INTERNAL, STATE_R300_TEXRECT_FACTOR, 0, 0, 0, 0 }; + gl_state_index tokens[STATE_LENGTH] = { + STATE_INTERNAL, STATE_R300_TEXRECT_FACTOR, 0, 0, 0 + }; int factor_index; GLuint factorreg; @@ -2052,7 +2055,9 @@ static GLboolean parse_program(struct r300_fragment_program *rp) static void insert_wpos(struct gl_program *prog) { - GLint tokens[6] = { STATE_INTERNAL, STATE_R300_WINDOW_DIMENSION, 0, 0, 0, 0 }; + static gl_state_index tokens[STATE_LENGTH] = { + STATE_INTERNAL, STATE_R300_WINDOW_DIMENSION, 0, 0, 0 + }; struct prog_instruction *fpi; GLuint window_index; int i = 0; |