summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2009-11-02 08:49:02 +0000
committerKeith Whitwell <[email protected]>2009-11-02 08:50:16 +0000
commit4ea94c04c9ab7b11fa06c60f2487a911f1422844 (patch)
tree6adb4272ca3e14776ca783cd54f5edf3dc770e36 /src
parent23c2ba828058255d8fdf3471bb924127e6c27f6c (diff)
i965g: format RELOCs similarly
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/i965/brw_cc.c3
-rw-r--r--src/gallium/drivers/i965/brw_clip_state.c3
-rw-r--r--src/gallium/drivers/i965/brw_misc_state.c32
3 files changed, 26 insertions, 12 deletions
diff --git a/src/gallium/drivers/i965/brw_cc.c b/src/gallium/drivers/i965/brw_cc.c
index cf3791e11e3..c6267e1c606 100644
--- a/src/gallium/drivers/i965/brw_cc.c
+++ b/src/gallium/drivers/i965/brw_cc.c
@@ -151,8 +151,7 @@ cc_unit_create_from_key(struct brw_context *brw, struct brw_cc_unit_key *key)
/* Emit CC viewport relocation */
brw->sws->bo_emit_reloc(bo,
- I915_GEM_DOMAIN_INSTRUCTION,
- 0,
+ I915_GEM_DOMAIN_INSTRUCTION, 0,
0,
offsetof(struct brw_cc_unit_state, cc4),
brw->cc.vp_bo);
diff --git a/src/gallium/drivers/i965/brw_clip_state.c b/src/gallium/drivers/i965/brw_clip_state.c
index 31e2e0bc17b..8be53e4bfb4 100644
--- a/src/gallium/drivers/i965/brw_clip_state.c
+++ b/src/gallium/drivers/i965/brw_clip_state.c
@@ -150,8 +150,7 @@ clip_unit_create_from_key(struct brw_context *brw,
/* Emit clip program relocation */
assert(brw->clip.prog_bo);
brw->sws->bo_emit_reloc(bo,
- I915_GEM_DOMAIN_INSTRUCTION,
- 0,
+ I915_GEM_DOMAIN_INSTRUCTION, 0,
clip.thread0.grf_reg_count << 1,
offsetof(struct brw_clip_unit_state, thread0),
brw->clip.prog_bo);
diff --git a/src/gallium/drivers/i965/brw_misc_state.c b/src/gallium/drivers/i965/brw_misc_state.c
index db8a2a50088..06b9a2d2dfa 100644
--- a/src/gallium/drivers/i965/brw_misc_state.c
+++ b/src/gallium/drivers/i965/brw_misc_state.c
@@ -110,13 +110,17 @@ static int upload_binding_table_pointers(struct brw_context *brw)
BEGIN_BATCH(6, IGNORE_CLIPRECTS);
OUT_BATCH(CMD_BINDING_TABLE_PTRS << 16 | (6 - 2));
if (brw->vs.bind_bo != NULL)
- OUT_RELOC(brw->vs.bind_bo, I915_GEM_DOMAIN_SAMPLER, 0, 0); /* vs */
+ OUT_RELOC(brw->vs.bind_bo,
+ I915_GEM_DOMAIN_SAMPLER, 0,
+ 0); /* vs */
else
OUT_BATCH(0);
OUT_BATCH(0); /* gs */
OUT_BATCH(0); /* clip */
OUT_BATCH(0); /* sf */
- OUT_RELOC(brw->wm.bind_bo, I915_GEM_DOMAIN_SAMPLER, 0, 0); /* wm/ps */
+ OUT_RELOC(brw->wm.bind_bo,
+ I915_GEM_DOMAIN_SAMPLER, 0,
+ 0); /* wm/ps */
ADVANCE_BATCH();
return 0;
}
@@ -142,15 +146,27 @@ static int upload_pipelined_state_pointers(struct brw_context *brw )
{
BEGIN_BATCH(7, IGNORE_CLIPRECTS);
OUT_BATCH(CMD_PIPELINED_STATE_POINTERS << 16 | (7 - 2));
- OUT_RELOC(brw->vs.state_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+ OUT_RELOC(brw->vs.state_bo,
+ I915_GEM_DOMAIN_INSTRUCTION, 0,
+ 0);
if (brw->gs.prog_active)
- OUT_RELOC(brw->gs.state_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 1);
+ OUT_RELOC(brw->gs.state_bo,
+ I915_GEM_DOMAIN_INSTRUCTION, 0,
+ 1);
else
OUT_BATCH(0);
- OUT_RELOC(brw->clip.state_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 1);
- OUT_RELOC(brw->sf.state_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
- OUT_RELOC(brw->wm.state_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
- OUT_RELOC(brw->cc.state_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+ OUT_RELOC(brw->clip.state_bo,
+ I915_GEM_DOMAIN_INSTRUCTION, 0,
+ 1);
+ OUT_RELOC(brw->sf.state_bo,
+ I915_GEM_DOMAIN_INSTRUCTION, 0,
+ 0);
+ OUT_RELOC(brw->wm.state_bo,
+ I915_GEM_DOMAIN_INSTRUCTION, 0,
+ 0);
+ OUT_RELOC(brw->cc.state_bo,
+ I915_GEM_DOMAIN_INSTRUCTION, 0,
+ 0);
ADVANCE_BATCH();
brw->state.dirty.brw |= BRW_NEW_PSP;