summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-09-19 10:16:46 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-09-19 10:16:46 -0600
commitb3cc74aa448f42340cbd01578a51f94eb2949618 (patch)
tree355180314fc63e40c87142e0cdbcdb45c465bb11 /src/mesa/state_tracker
parentbcc13fd3f8cc1c235ef5114472b0f919a38c096b (diff)
grab vertex program pointer after state validation
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_draw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index bff0ad7ef7..6efe3ce8b8 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 */