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/i830_exa.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/i830_exa.c')
| -rw-r--r-- | src/i830_exa.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c index bb60c0ac..22618dcd 100644 --- a/src/i830_exa.c +++ b/src/i830_exa.c @@ -270,22 +270,6 @@ I830EXADoneCopy(PixmapPtr pDstPixmap) #endif } -void -i830_enter_render(ScrnInfoPtr pScrn) -{ - I830Ptr pI830 = I830PTR(pScrn); -#ifdef XF86DRI - if (pI830->directRenderingEnabled) { - drmI830Sarea *pSAREAPriv = DRIGetSAREAPrivate(pScrn->pScreen); - pSAREAPriv->ctxOwner = DRIGetContext(pScrn->pScreen); - } -#endif - if (pI830->last_3d != LAST_3D_RENDER) { - i830WaitSync(pScrn); - pI830->last_3d = LAST_3D_RENDER; - } -} - #define xFixedToFloat(val) \ ((float)xFixedToInt(val) + ((float)xFixedFrac(val) / 65536.0)) |