summaryrefslogtreecommitdiff
path: root/src/i830_render.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-06-04 16:37:53 -0700
committerEric Anholt <eric@anholt.net>2007-06-12 10:04:39 -0700
commitceb6dd72443c094212b0281c42cbe92e9a29f682 (patch)
treea20d599276c0964cfd84c50d6d8b04adfbad54ba /src/i830_render.c
parentc2b130354aecffbeb2a2d23c7371461feaf5766a (diff)
Fix context switching between DRI and X.
Now, all 3D pipeline consumers in the driver just call IntelEmitInvariantState(), which handles basic state setup, the caching of that state setup, and notifying DRI clients. This also removes a mistaken idle wait in the Render code which was papering over the brokenness in the context switching.
Diffstat (limited to 'src/i830_render.c')
-rw-r--r--src/i830_render.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i830_render.c b/src/i830_render.c
index 957953e7..90b884fa 100644
--- a/src/i830_render.c
+++ b/src/i830_render.c
@@ -400,7 +400,8 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
I830Ptr pI830 = I830PTR(pScrn);
CARD32 dst_format, dst_offset, dst_pitch;
- i830_enter_render(pScrn);
+ IntelEmitInvarientState(pScrn);
+ *pI830->last_3d = LAST_3D_RENDER;
i830_get_dest_format(pDstPicture, &dst_format);
dst_offset = intel_get_pixmap_offset(pDst);