diff options
| author | Kenneth Graunke <[email protected]> | 2012-08-21 23:54:19 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-08-19 13:16:59 -0700 |
| commit | decc708c7c3ab53922cf3ac94cd74231196fd0cb (patch) | |
| tree | a3592f10a9cdde5c8426800ff14634bc400b6032 /src/mesa/drivers/dri/i965/brw_vs_state.c | |
| parent | 9525bcf5f799ffdf6db4cfa41da0daee142e6d3a (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/brw_vs_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c index 13aabac43d9..a8729df336c 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_state.c @@ -157,12 +157,12 @@ brw_upload_vs_unit(struct brw_context *brw) */ if (brw->vs.sampler_count) { vs->vs5.sampler_state_pointer = - (brw->batch.bo->offset + brw->sampler.offset) >> 5; + (brw->batch.bo->offset + brw->vs.sampler_offset) >> 5; drm_intel_bo_emit_reloc(brw->batch.bo, brw->vs.state_offset + offsetof(struct brw_vs_unit_state, vs5), brw->batch.bo, - brw->sampler.offset | vs->vs5.sampler_count, + brw->vs.sampler_offset | vs->vs5.sampler_count, I915_GEM_DOMAIN_INSTRUCTION, 0); } |