diff options
| author | Eric Anholt <eric@anholt.net> | 2006-08-09 14:19:06 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-08-09 14:19:06 -0700 |
| commit | 24e59a0daa20b7c3e5028c9ca7972052801d02a1 (patch) | |
| tree | 05c71510bbb570aabb6373690a8fd796611aa1fe /src/i830_rotate.c | |
| parent | bb6080735efc40e103e92b65d0c2f1f729156632 (diff) | |
| parent | 32f1199937e92b9100aba52cbbb97157014e3182 (diff) | |
Merge branch 'textured-video', bringing in fixed-up i915 textured video.
Conflicts:
src/i830_video.c
Diffstat (limited to 'src/i830_rotate.c')
| -rw-r--r-- | src/i830_rotate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_rotate.c b/src/i830_rotate.c index 425eeeff..aee04daf 100644 --- a/src/i830_rotate.c +++ b/src/i830_rotate.c @@ -576,7 +576,7 @@ I830UpdateRotate (ScreenPtr pScreen, OUT_RING(MI_FLUSH | MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE); OUT_RING(0x00000000); /* draw rect */ - OUT_RING(STATE3D_DRAWING_RECTANGLE); + OUT_RING(_3DSTATE_DRAW_RECT_CMD); OUT_RING(0x00000000); /* flags */ OUT_RING(0x00000000); /* ymin, xmin */ OUT_RING((pScrn->virtualX - 1) | (pScrn->virtualY - 1) << 16); /* ymax, xmax */ @@ -584,7 +584,7 @@ I830UpdateRotate (ScreenPtr pScreen, OUT_RING(MI_NOOP); /* front buffer */ - OUT_RING(STATE3D_BUFFER_INFO); + OUT_RING(_3DSTATE_BUF_INFO_CMD); OUT_RING(0x03800000 | (((pI830->displayWidth * pI830->cpp) / 4) << 2)); if (I830IsPrimary(pScrn)) OUT_RING(pI830->FrontBuffer.Start); |