diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-03 14:21:19 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-09 14:09:08 -0700 |
| commit | 329779a0b45b63be17627f026533c80b2c8f7991 (patch) | |
| tree | 88ee98c79bdfdacaf50b53d7303caf2f1d63688b /src/mesa/drivers/dri/i965/brw_wm_state.c | |
| parent | 5d8186ac1a22afbaa6ed68e0fb67d1f150f798cb (diff) | |
| download | external_mesa3d-329779a0b45b63be17627f026533c80b2c8f7991.zip external_mesa3d-329779a0b45b63be17627f026533c80b2c8f7991.tar.gz external_mesa3d-329779a0b45b63be17627f026533c80b2c8f7991.tar.bz2 | |
i965: Move intel_context::batch to brw_context.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Anuj Phogat <anuj.phogat@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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c index 4bac56a..63b8916 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c @@ -142,7 +142,7 @@ brw_upload_wm_unit(struct brw_context *brw) if (brw->sampler.count) { /* reloc */ - wm->wm4.sampler_state_pointer = (intel->batch.bo->offset + + wm->wm4.sampler_state_pointer = (brw->batch.bo->offset + brw->sampler.offset) >> 5; } else { wm->wm4.sampler_state_pointer = 0; @@ -209,7 +209,7 @@ brw_upload_wm_unit(struct brw_context *brw) /* Emit scratch space relocation */ if (brw->wm.prog_data->total_scratch != 0) { - drm_intel_bo_emit_reloc(intel->batch.bo, + drm_intel_bo_emit_reloc(brw->batch.bo, brw->wm.state_offset + offsetof(struct brw_wm_unit_state, thread2), brw->wm.scratch_bo, @@ -219,10 +219,10 @@ brw_upload_wm_unit(struct brw_context *brw) /* Emit sampler state relocation */ if (brw->sampler.count != 0) { - drm_intel_bo_emit_reloc(intel->batch.bo, + drm_intel_bo_emit_reloc(brw->batch.bo, brw->wm.state_offset + offsetof(struct brw_wm_unit_state, wm4), - intel->batch.bo, (brw->sampler.offset | + brw->batch.bo, (brw->sampler.offset | wm->wm4.stats_enable | (wm->wm4.sampler_count << 2)), I915_GEM_DOMAIN_INSTRUCTION, 0); |