diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2009-11-26 01:15:25 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2009-11-26 01:15:25 +0100 |
| commit | 4dcdf3b9c67f1481d46c1decba84c9c55698db4c (patch) | |
| tree | 7d43399738dd38344b511971891f349178a6f52d /src/mesa/state_tracker/st_draw.c | |
| parent | 9e3728c858e0f84b05a24f858f6aeba53fa4e7cb (diff) | |
| parent | 07fafc7c9346aa260829603bf3188596481e9e62 (diff) | |
Merge commit 'origin/st-shader-varients'
Conflicts:
src/mesa/state_tracker/st_atom_shader.c
src/mesa/state_tracker/st_program.c
Diffstat (limited to 'src/mesa/state_tracker/st_draw.c')
| -rw-r--r-- | src/mesa/state_tracker/st_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 68bc76b572..e13ae57a0e 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -573,7 +573,7 @@ st_draw_vbo(GLcontext *ctx, /* must get these after state validation! */ vp = ctx->st->vp; - vs = &ctx->st->vp->state; + vs = &ctx->st->vp_varient->state; #if 0 if (MESA_VERBOSE & VERBOSE_GLSL) { |