diff options
| author | Henri Verbeet <hverbeet@gmail.com> | 2010-04-04 10:24:46 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-05 09:34:31 -0600 |
| commit | f820b263db0d3bc46b4ea7b41bbe026cbf990430 (patch) | |
| tree | b51d0c43b9e288e54b98ce443645cdc33c994adc /src | |
| parent | 42ea25cb4ecae09b5cc011a95d42ba7f0645dde3 (diff) | |
mesa: update_arrays() depends on program state.
It uses ctx->VertexProgram._Current.
Signed-off-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/state.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 589029db58..b971cc976e 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -582,9 +582,6 @@ _mesa_update_state_locked( GLcontext *ctx ) if (new_state & _DD_NEW_SEPARATE_SPECULAR) update_separate_specular( ctx ); - if (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT)) - update_arrays( ctx ); - if (new_state & (_NEW_BUFFERS | _NEW_VIEWPORT)) update_viewport_matrix(ctx); @@ -620,6 +617,8 @@ _mesa_update_state_locked( GLcontext *ctx ) new_prog_state |= update_program( ctx ); } + if (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT)) + update_arrays( ctx ); out: new_prog_state |= update_program_constants(ctx); |