Mesa (master): mesa: update_arrays() depends on program state.

Dave Airlie airlied at kemper.freedesktop.org
Thu Apr 8 06:51:37 UTC 2010


Module: Mesa
Branch: master
Commit: f820b263db0d3bc46b4ea7b41bbe026cbf990430
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f820b263db0d3bc46b4ea7b41bbe026cbf990430

Author: Henri Verbeet <hverbeet at gmail.com>
Date:   Sun Apr  4 10:24:46 2010 -0700

mesa: update_arrays() depends on program state.

It uses ctx->VertexProgram._Current.

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

---

 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);




More information about the mesa-commit mailing list