diff options
| author | Eric Anholt <eric@anholt.net> | 2010-06-07 09:52:14 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-06-08 13:42:02 -0700 |
| commit | df3c1a563f3d76b07ab82c7b230b0030452f36ff (patch) | |
| tree | a75c039c4bda73e89939fb46866b99d9e634512f /src/mesa/drivers/dri/i965/brw_wm_state.c | |
| parent | 34474fa4119378ef9fbb9fb557cc19c0a1ca1f7e (diff) | |
intel: Convert remaining dri_bo_emit_reloc to drm_intel_bo_emit_reloc.
The new API makes so much more sense, I'd like to forget how the old
one worked.
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_state.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c index f36f62611e..1789b21451 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c @@ -213,28 +213,24 @@ wm_unit_create_from_key(struct brw_context *brw, struct brw_wm_unit_key *key, &wm, sizeof(wm)); /* Emit WM program relocation */ - dri_bo_emit_reloc(bo, - I915_GEM_DOMAIN_INSTRUCTION, 0, - wm.thread0.grf_reg_count << 1, - offsetof(struct brw_wm_unit_state, thread0), - brw->wm.prog_bo); + drm_intel_bo_emit_reloc(bo, offsetof(struct brw_wm_unit_state, thread0), + brw->wm.prog_bo, wm.thread0.grf_reg_count << 1, + I915_GEM_DOMAIN_INSTRUCTION, 0); /* Emit scratch space relocation */ if (key->total_scratch != 0) { - dri_bo_emit_reloc(bo, - 0, 0, - wm.thread2.per_thread_scratch_space, - offsetof(struct brw_wm_unit_state, thread2), - brw->wm.scratch_bo); + drm_intel_bo_emit_reloc(bo, offsetof(struct brw_wm_unit_state, thread2), + brw->wm.scratch_bo, + wm.thread2.per_thread_scratch_space, + 0, 0); } /* Emit sampler state relocation */ if (key->sampler_count != 0) { - dri_bo_emit_reloc(bo, - I915_GEM_DOMAIN_INSTRUCTION, 0, - wm.wm4.stats_enable | (wm.wm4.sampler_count << 2), - offsetof(struct brw_wm_unit_state, wm4), - brw->wm.sampler_bo); + drm_intel_bo_emit_reloc(bo, offsetof(struct brw_wm_unit_state, wm4), + brw->wm.sampler_bo, (wm.wm4.stats_enable | + (wm.wm4.sampler_count << 2)), + I915_GEM_DOMAIN_INSTRUCTION, 0); } return bo; |