diff options
| author | Paul Berry <stereotype441@gmail.com> | 2013-08-24 08:24:57 -0700 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2013-08-31 17:11:05 -0700 |
| commit | ec94e3c3d02857e26ba66e7e6a4b54044c820a0a (patch) | |
| tree | a7041f672def8f00315d961f26e3a6d1be429e4b /src/mesa/drivers/dri/i965/gen6_sampler_state.c | |
| parent | cdf03b69282d12f9d27daf2edb3abb351f5de7f6 (diff) | |
| download | external_mesa3d-ec94e3c3d02857e26ba66e7e6a4b54044c820a0a.zip external_mesa3d-ec94e3c3d02857e26ba66e7e6a4b54044c820a0a.tar.gz external_mesa3d-ec94e3c3d02857e26ba66e7e6a4b54044c820a0a.tar.bz2 | |
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 <chad.versace@linux.intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_sampler_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_sampler_state.c | 2 |
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 16be8a7..5416a17 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(); |