aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/state.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-16 15:32:19 +0000
committermarha <marha@users.sourceforge.net>2010-06-16 15:32:19 +0000
commit243edb24f5179d93c849ea326fb489d3f846db71 (patch)
tree3649730a6be58d10e03a7d5b7825c1a82e5e0def /mesalib/src/mesa/main/state.c
parent2a31e38d82566c4f93773ecf9c79f2cc9abef169 (diff)
downloadvcxsrv-243edb24f5179d93c849ea326fb489d3f846db71.tar.gz
vcxsrv-243edb24f5179d93c849ea326fb489d3f846db71.tar.bz2
vcxsrv-243edb24f5179d93c849ea326fb489d3f846db71.zip
Updated to mesa-7.8.1
Diffstat (limited to 'mesalib/src/mesa/main/state.c')
-rw-r--r--mesalib/src/mesa/main/state.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/state.c b/mesalib/src/mesa/main/state.c
index 589029db5..b971cc976 100644
--- a/mesalib/src/mesa/main/state.c
+++ b/mesalib/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);