diff options
| author | Nicolai Haehnle <[email protected]> | 2007-03-26 21:41:17 +0200 |
|---|---|---|
| committer | Nicolai Haehnle <[email protected]> | 2007-03-26 21:41:57 +0200 |
| commit | 11702680888038a22d9a406ea5646af2902c125e (patch) | |
| tree | c5473213fb1fc9d41f1e57fc5754cc6cb2cda0f7 /src/mesa | |
| parent | 38a1c2b4959d35236933c14d3944cce94283ca30 (diff) | |
r300: Fix warnings that were introduced by the glsl merge
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_fragprog.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c index 77f95605e4d..26b09b4db23 100644 --- a/src/mesa/drivers/dri/r300/r300_fragprog.c +++ b/src/mesa/drivers/dri/r300/r300_fragprog.c @@ -949,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; @@ -2053,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; |