summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/gen6_vs_state.c
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2012-08-21 15:24:14 -0700
committerKenneth Graunke <kenneth@whitecape.org>2013-08-19 13:16:59 -0700
commitf5a690cb68d69c0279ab95ecb2d188ede13ada03 (patch)
treeba487a4619f4b62ed7cb2b2b73ee4344e333ff24 /src/mesa/drivers/dri/i965/gen6_vs_state.c
parent44960ef918fff24cf7e49f4c89e845709aae3541 (diff)
downloadexternal_mesa3d-f5a690cb68d69c0279ab95ecb2d188ede13ada03.zip
external_mesa3d-f5a690cb68d69c0279ab95ecb2d188ede13ada03.tar.gz
external_mesa3d-f5a690cb68d69c0279ab95ecb2d188ede13ada03.tar.bz2
i965: Split sampler count variable to be per-stage.
Currently, we only have a single sampler state table shared among all stages, so we just copy wm.sampler_count into vs.sampler_count. In the future, each shader stage will have its own SAMPLER_STATE table, at which point we'll need these separate sampler counts. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Paul Berry <stereotype441@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_vs_state.c')
-rw-r--r--src/mesa/drivers/dri/i965/gen6_vs_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c
index da20713..4af7cda 100644
--- a/src/mesa/drivers/dri/i965/gen6_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c
@@ -149,7 +149,7 @@ upload_vs_state(struct brw_context *brw)
OUT_BATCH(_3DSTATE_VS << 16 | (6 - 2));
OUT_BATCH(brw->vs.prog_offset);
OUT_BATCH(floating_point_mode |
- ((ALIGN(brw->sampler.count, 4)/4) << GEN6_VS_SAMPLER_COUNT_SHIFT));
+ ((ALIGN(brw->vs.sampler_count, 4)/4) << GEN6_VS_SAMPLER_COUNT_SHIFT));
if (brw->vs.prog_data->base.total_scratch) {
OUT_RELOC(brw->vs.scratch_bo,