diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2012-08-21 15:24:14 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-08-19 13:16:59 -0700 |
| commit | f5a690cb68d69c0279ab95ecb2d188ede13ada03 (patch) | |
| tree | ba487a4619f4b62ed7cb2b2b73ee4344e333ff24 /src/mesa/drivers/dri/i965/brw_wm_state.c | |
| parent | 44960ef918fff24cf7e49f4c89e845709aae3541 (diff) | |
| download | external_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/brw_wm_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c index 631f351..106d628 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c @@ -144,10 +144,10 @@ brw_upload_wm_unit(struct brw_context *brw) wm->wm4.sampler_count = 0; /* hardware requirement */ else { /* CACHE_NEW_SAMPLER */ - wm->wm4.sampler_count = (brw->sampler.count + 1) / 4; + wm->wm4.sampler_count = (brw->wm.sampler_count + 1) / 4; } - if (brw->sampler.count) { + if (brw->wm.sampler_count) { /* reloc */ wm->wm4.sampler_state_pointer = (brw->batch.bo->offset + brw->sampler.offset) >> 5; @@ -225,7 +225,7 @@ brw_upload_wm_unit(struct brw_context *brw) } /* Emit sampler state relocation */ - if (brw->sampler.count != 0) { + if (brw->wm.sampler_count != 0) { drm_intel_bo_emit_reloc(brw->batch.bo, brw->wm.state_offset + offsetof(struct brw_wm_unit_state, wm4), |