From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 19 Sep 2007 16:16:46 +0000 (-0600)
Subject: grab vertex program pointer after state validation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b3cc74aa448f42340cbd01578a51f94eb2949618;p=mesa.git

grab vertex program pointer after state validation
---

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index bff0ad7ef7a..6efe3ce8b8e 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -187,7 +187,7 @@ st_draw_vbo(GLcontext *ctx,
             GLuint max_index)
 {
    struct pipe_context *pipe = ctx->st->pipe;
-   const struct st_vertex_program *vp = ctx->st->vp;
+   const struct st_vertex_program *vp;
    const struct pipe_shader_state *vs;
    const unsigned attr0_offset = (unsigned) arrays[0]->Ptr;
    GLboolean needDefaultAttribs = GL_FALSE;
@@ -195,7 +195,8 @@ st_draw_vbo(GLcontext *ctx,
 
    st_validate_state(ctx->st);
 
-   /* must do this after state validation! */
+   /* must get these after state validation! */
+   vp = ctx->st->vp;
    vs = ctx->st->state.vs;
 
    /* loop over TGSI shader inputs */