diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-04-08 16:48:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-08 16:48:41 +1000 |
| commit | dff50ff592da7cb1d784fae794dd1647a5445bca (patch) | |
| tree | cd1b29e4001b8afdfff2520a01fcfba6b8b250e9 /src/mesa/main/state.c | |
| parent | 968bf9634ec03e61441834603f13f0c914bbb0ce (diff) | |
| parent | 4b39a0da89f5b07d4a24bc9ce52693e6c2acfe99 (diff) | |
Merge remote branch 'origin/7.8'
Conflicts:
Makefile
configs/default
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/main/state.c')
| -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); |