xf86-video-intel: Branch 'exa' - src/i915_exa_render.c
Eric Anholt
anholt at kemper.freedesktop.org
Tue Jul 25 21:09:56 PDT 2006
src/i915_exa_render.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
New commits:
diff-tree 38d1a5e0dbe059f5c01bd5120a108a386ff10718 (from aec88cf4c66833f89afa5f8fa4f8bcf30b2b6b4b)
Author: Eric Anholt <anholt at leguin.anholt.net>
Date: Tue Jul 25 21:09:12 2006 -0700
Replace some OUT_RING(0)s with OUT_RING(MI_NOOP) to remind me why they're there.
diff --git a/src/i915_exa_render.c b/src/i915_exa_render.c
index 08736cc..7555b41 100644
--- a/src/i915_exa_render.c
+++ b/src/i915_exa_render.c
@@ -307,7 +307,7 @@ I915TextureSetup(PicturePtr pPict, Pixma
ms3 |= MS3_USE_FENCE_REGS;
OUT_RING(ms3);
OUT_RING(((pitch / 4) - 1) << MS4_PITCH_SHIFT);
- OUT_RING(0);
+ OUT_RING(MI_NOOP);
ADVANCE_LP_RING();
}
@@ -328,7 +328,7 @@ I915TextureSetup(PicturePtr pPict, Pixma
ss3 |= (unit << SS3_TEXTUREMAP_INDEX_SHIFT);
OUT_RING(ss3);
OUT_RING(0x00000000); /* border color */
- OUT_RING(0);
+ OUT_RING(MI_NOOP);
ADVANCE_LP_RING();
}
@@ -393,13 +393,13 @@ ErrorF("i915 prepareComposite\n");
/* XXX: defaults */
OUT_RING(_3DSTATE_DFLT_Z_CMD);
- OUT_RING(0);
+ OUT_RING(MI_NOOP);
OUT_RING(_3DSTATE_DFLT_DIFFUSE_CMD);
- OUT_RING(0);
+ OUT_RING(MI_NOOP);
OUT_RING(_3DSTATE_DFLT_SPEC_CMD);
- OUT_RING(0);
+ OUT_RING(MI_NOOP);
/* XXX:S3? define vertex format with tex coord sets number*/
OUT_RING(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(2) |
@@ -426,7 +426,7 @@ ErrorF("i915 prepareComposite\n");
/* issue a flush */
OUT_RING(MI_FLUSH | MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE);
- OUT_RING(0);
+ OUT_RING(MI_NOOP);
/* draw rect is unconditional */
OUT_RING(_3DSTATE_DRAW_RECT_CMD);
@@ -434,7 +434,7 @@ ErrorF("i915 prepareComposite\n");
OUT_RING(0x00000000); /* ymin, xmin*/
OUT_RING(DRAW_YMAX(pScrn->virtualY-1) | DRAW_XMAX(pScrn->virtualX-1));
OUT_RING(0x00000000); /* yorig, xorig (relate to color buffer?)*/
- OUT_RING(0);
+ OUT_RING(MI_NOOP);
ADVANCE_LP_RING();
}
More information about the xorg-commit
mailing list