diff options
| author | Eric Anholt <eric@anholt.net> | 2007-06-04 16:37:53 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-06-12 10:04:39 -0700 |
| commit | ceb6dd72443c094212b0281c42cbe92e9a29f682 (patch) | |
| tree | a20d599276c0964cfd84c50d6d8b04adfbad54ba /src/i915_render.c | |
| parent | c2b130354aecffbeb2a2d23c7371461feaf5766a (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/i915_render.c')
| -rw-r--r-- | src/i915_render.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i915_render.c b/src/i915_render.c index d5a8579a..b2dacfe7 100644 --- a/src/i915_render.c +++ b/src/i915_render.c @@ -315,7 +315,8 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture, CARD32 dst_format, dst_offset, dst_pitch; CARD32 blendctl; - i830_enter_render(pScrn); + IntelEmitInvarientState(pScrn); + *pI830->last_3d = LAST_3D_RENDER; i915_get_dest_format(pDstPicture, &dst_format); dst_offset = intel_get_pixmap_offset(pDst); |