fix up radeon span functions using latest r200 code from Brian,

[mesa.git] / src / mesa / drivers / dri / gamma / gamma_xmesa.c

diff --git a/src/mesa/drivers/dri/gamma/gamma_xmesa.c b/src/mesa/drivers/dri/gamma/gamma_xmesa.c
index 30c2ba023afeb0ea26aed1f90c17c7d732f33cbd..00f6aa32aeb990ba7c8c6de0593dc73bde0fb607 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_xmesa.c
+++ b/src/mesa/drivers/dri/gamma/gamma_xmesa.c
@@ -225,11 +225,6 @@ newGammaCtx->new_state |= GAMMA_NEW_WINDOW; /* FIXME */
        _mesa_make_current2( newGammaCtx->glCtx, 
                          (GLframebuffer *) driDrawPriv->driverPrivate,
                          (GLframebuffer *) driReadPriv->driverPrivate );
-
-       if (!newGammaCtx->glCtx->Viewport.Width) {
-           _mesa_set_viewport(newGammaCtx->glCtx, 0, 0, 
-                                       driDrawPriv->w, driDrawPriv->h);
-       }
     } else {
        _mesa_make_current( 0, 0 );
     }
@@ -262,7 +257,6 @@ static struct __DriverAPIRec gammaAPI = {
  * The __driCreateScreen name is the symbol that libGL.so fetches.
  * Return:  pointer to a __DRIscreenPrivate.
  */
-#ifndef _SOLO
 void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
                         int numConfigs, __GLXvisualConfig *config)
 {
@@ -270,12 +264,3 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
    psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &gammaAPI);
    return (void *) psp;
 }
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
-                        struct DRIDriverContextRec *driverContext)
-{
-   __DRIscreenPrivate *psp;
-   psp = __driUtilCreateScreen(driver, driverContext, &gammaAPI);
-   return (void *) psp;
-}
-#endif