diff options
| author | Kenneth Graunke <[email protected]> | 2013-07-03 14:21:19 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-07-09 14:09:08 -0700 |
| commit | 329779a0b45b63be17627f026533c80b2c8f7991 (patch) | |
| tree | 88ee98c79bdfdacaf50b53d7303caf2f1d63688b /src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | |
| parent | 5d8186ac1a22afbaa6ed68e0fb67d1f150f798cb (diff) | |
i965: Move intel_context::batch to brw_context.
Signed-off-by: Kenneth Graunke <[email protected]>
Acked-by: Chris Forbes <[email protected]>
Acked-by: Paul Berry <[email protected]>
Acked-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm_sampler_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c index 006aa68a0b4..b75882d20bf 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c @@ -342,14 +342,14 @@ static void brw_update_sampler_state(struct brw_context *brw, sampler->ss2.default_color_pointer = brw->wm.sdc_offset[ss_index] >> 5; } else { /* reloc */ - sampler->ss2.default_color_pointer = (intel->batch.bo->offset + + sampler->ss2.default_color_pointer = (brw->batch.bo->offset + brw->wm.sdc_offset[ss_index]) >> 5; - drm_intel_bo_emit_reloc(intel->batch.bo, + drm_intel_bo_emit_reloc(brw->batch.bo, brw->sampler.offset + ss_index * sizeof(struct brw_sampler_state) + offsetof(struct brw_sampler_state, ss2), - intel->batch.bo, brw->wm.sdc_offset[ss_index], + brw->batch.bo, brw->wm.sdc_offset[ss_index], I915_GEM_DOMAIN_SAMPLER, 0); } |