diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-25 09:00:19 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-25 09:00:19 -0600 |
| commit | ecf3091cc78638919f1977ccc0307c51b6731385 (patch) | |
| tree | e8dca04db94ce566f3dadf148236b5a4d0c901cb /src/mesa/shader | |
| parent | 5f4f7ad965c40327f16297606ed4f425598bfc2c (diff) | |
| parent | 46da1f2c9b67e3b4c3659f2d029140b639571407 (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_clear.c
Diffstat (limited to 'src/mesa/shader')
| -rw-r--r-- | src/mesa/shader/nvvertparse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c index 6ab8a14cb9..8574016050 100644 --- a/src/mesa/shader/nvvertparse.c +++ b/src/mesa/shader/nvvertparse.c @@ -1415,9 +1415,10 @@ _mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum dstTarget, * upload everything, _mesa_layout_parameters is the answer. */ for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS; i++) { + GLint index; state_tokens[2] = i; - int index = _mesa_add_state_reference(program->Base.Parameters, - state_tokens); + index = _mesa_add_state_reference(program->Base.Parameters, + state_tokens); assert(index == i); } program->Base.NumParameters = program->Base.Parameters->NumParameters; |