Henri Verbeet wrote: > It uses ctx->VertexProgram._Current. > --- > 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 589029d..b971cc9 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);
Looks good. I'll commit shortly. Thanks. -Brian ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
