summaryrefslogtreecommitdiff
path: root/src/i830_render.c
diff options
context:
space:
mode:
authorWang Zhenyu <zhenyu.z.wang@intel.com>2007-05-18 10:10:34 +0800
committerWang Zhenyu <zhenyu.z.wang@intel.com>2007-05-18 10:10:34 +0800
commit4120a20626998272424225261f2cf7960b7ec0ca (patch)
treea9373564cc59d7f125e2029d68d884d4471aeaa9 /src/i830_render.c
parent8db28aeaa6e908017b40bd9180f144a2972f6278 (diff)
EXA: add render enter helper function
That notify mesa rendering is smashing the state, and check last 3d operation to do sync after we're swapped in or others.
Diffstat (limited to 'src/i830_render.c')
-rw-r--r--src/i830_render.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/i830_render.c b/src/i830_render.c
index 077afa1a..957953e7 100644
--- a/src/i830_render.c
+++ b/src/i830_render.c
@@ -400,12 +400,12 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
I830Ptr pI830 = I830PTR(pScrn);
CARD32 dst_format, dst_offset, dst_pitch;
+ i830_enter_render(pScrn);
+
i830_get_dest_format(pDstPicture, &dst_format);
dst_offset = intel_get_pixmap_offset(pDst);
dst_pitch = intel_get_pixmap_pitch(pDst);
- pI830->last_3d = LAST_3D_RENDER;
-
if (!i830_texture_setup(pSrcPicture, pSrc, 0))
I830FALLBACK("fail to setup src texture\n");
if (pMask != NULL) {
@@ -632,9 +632,5 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
void
i830_done_composite(PixmapPtr pDst)
{
-#if ALWAYS_SYNC
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
-
- I830Sync(pScrn);
-#endif
+ /* NO-OP */
}