From: Henri Verbeet <hverbeet@gmail.com>
Date: Sun, 4 Apr 2010 17:24:46 +0000 (-0700)
Subject: mesa: update_arrays() depends on program state.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f820b263db0d3bc46b4ea7b41bbe026cbf990430;p=mesa.git

mesa: update_arrays() depends on program state.

It uses ctx->VertexProgram._Current.

Signed-off-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 589029db58b..b971cc976ee 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);