aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/gen6_sampler_state.c
diff options
context:
space:
mode:
authorPaul Berry <[email protected]>2013-08-24 08:24:57 -0700
committerPaul Berry <[email protected]>2013-08-31 17:11:05 -0700
commitec94e3c3d02857e26ba66e7e6a4b54044c820a0a (patch)
treea7041f672def8f00315d961f26e3a6d1be429e4b /src/mesa/drivers/dri/i965/gen6_sampler_state.c
parentcdf03b69282d12f9d27daf2edb3abb351f5de7f6 (diff)
i965: Move data from brw->vs into a base class if gs will also need it.
This paves the way for sharing the code that will set up the vertex and geometry shader pipeline state. v2: Rename the base class to brw_stage_state. Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_sampler_state.c')
-rw-r--r--src/mesa/drivers/dri/i965/gen6_sampler_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
index 16be8a79bfb..5416a179b55 100644
--- a/src/mesa/drivers/dri/i965/gen6_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
@@ -39,7 +39,7 @@ upload_sampler_state_pointers(struct brw_context *brw)
GS_SAMPLER_STATE_CHANGE |
PS_SAMPLER_STATE_CHANGE |
(4 - 2));
- OUT_BATCH(brw->vs.sampler_offset); /* VS */
+ OUT_BATCH(brw->vs.base.sampler_offset); /* VS */
OUT_BATCH(0); /* GS */
OUT_BATCH(brw->wm.sampler_offset);
ADVANCE_BATCH();