diff options
| author | Felix Kuehling <fxkuehl@gmx.de> | 2005-02-05 21:21:02 +0000 |
|---|---|---|
| committer | Felix Kuehling <fxkuehl@gmx.de> | 2005-02-05 21:21:02 +0000 |
| commit | 5bdf2bc6c707f0a815cc46fb0bab7e2a209110a3 (patch) | |
| tree | e7e44f784eb033ab47c7bba84dcdd99560d7e7a5 /src/mesa/drivers/dri/savage/savage_xmesa.c | |
| parent | d9d972a944c9953d99ff09deeb2a739386aa0a76 (diff) | |
- Fixed scissor rectangle not moving with the window (Xorg bug #1731).
- Flush buffered primitives before changing scissors.
- Require Savage DRM version 2.1.0, so that the broken single-cliprect
code can finally rest in peace.
- Removed some more dead code.
Diffstat (limited to 'src/mesa/drivers/dri/savage/savage_xmesa.c')
| -rw-r--r-- | src/mesa/drivers/dri/savage/savage_xmesa.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c index 9abb558471..38f679aee3 100644 --- a/src/mesa/drivers/dri/savage/savage_xmesa.c +++ b/src/mesa/drivers/dri/savage/savage_xmesa.c @@ -601,11 +601,10 @@ void savageXMesaSetFrontClipRects( savageContextPtr imesa ) imesa->numClipRects = dPriv->numClipRects; imesa->pClipRects = dPriv->pClipRects; - imesa->dirty |= SAVAGE_UPLOAD_CLIPRECTS; imesa->drawX = dPriv->x; imesa->drawY = dPriv->y; - savageEmitDrawingRectangle( imesa ); + savageCalcViewport( imesa->glCtx ); } @@ -630,10 +629,7 @@ void savageXMesaSetBackClipRects( savageContextPtr imesa ) imesa->drawY = dPriv->backY; } - savageEmitDrawingRectangle( imesa ); - imesa->dirty |= SAVAGE_UPLOAD_CLIPRECTS; - - + savageCalcViewport( imesa->glCtx ); } @@ -769,8 +765,7 @@ void savageGetLock( savageContextPtr imesa, GLuint flags ) SAVAGE_UPLOAD_FOGTBL | SAVAGE_UPLOAD_TEX0 | SAVAGE_UPLOAD_TEX1 | - SAVAGE_UPLOAD_TEXGLOBAL | - SAVAGE_UPLOAD_CLIPRECTS); + SAVAGE_UPLOAD_TEXGLOBAL); imesa->lostContext = GL_TRUE; sarea->ctxOwner = me; } @@ -929,7 +924,7 @@ void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc __DRIscreenPrivate *psp; static const __DRIversion ddx_expected = { 2, 0, 0 }; static const __DRIversion dri_expected = { 4, 0, 0 }; - static const __DRIversion drm_expected = { 2, 0, 0 }; + static const __DRIversion drm_expected = { 2, 1, 0 }; if ( ! driCheckDriDdxDrmVersions2( "Savage", dri_version, & dri_expected, |