aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/gen6_sampler_state.c
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2012-08-21 23:54:19 -0700
committerKenneth Graunke <[email protected]>2013-08-19 13:16:59 -0700
commitdecc708c7c3ab53922cf3ac94cd74231196fd0cb (patch)
treea3592f10a9cdde5c8426800ff14634bc400b6032 /src/mesa/drivers/dri/i965/gen6_sampler_state.c
parent9525bcf5f799ffdf6db4cfa41da0daee142e6d3a (diff)
i965: Upload separate per-stage sampler state tables.
Also upload separate sampler default/texture border color entries. At the moment, this is completely idiotic: both tables contain exactly the same contents, so we're simply wasting batch space and CPU time. However, soon we'll only upload data for textures actually /used/ in a particular stage, which will usually make the VS table empty and very likely eliminate all redundancy. This is just a stepping stone. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Paul Berry <[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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
index 0cc2a4566e1..16be8a79bfb 100644
--- a/src/mesa/drivers/dri/i965/gen6_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
@@ -39,9 +39,9 @@ upload_sampler_state_pointers(struct brw_context *brw)
GS_SAMPLER_STATE_CHANGE |
PS_SAMPLER_STATE_CHANGE |
(4 - 2));
- OUT_BATCH(brw->sampler.offset); /* VS */
+ OUT_BATCH(brw->vs.sampler_offset); /* VS */
OUT_BATCH(0); /* GS */
- OUT_BATCH(brw->sampler.offset);
+ OUT_BATCH(brw->wm.sampler_offset);
ADVANCE_BATCH();
}