Replace ctx->Driver.StencilOp/Func/Mask() functions with

[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 67bcf019d0c5c4768877674dbd7e6a34b7ac3144..00f6aa32aeb990ba7c8c6de0593dc73bde0fb607 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_xmesa.c
+++ b/src/mesa/drivers/dri/gamma/gamma_xmesa.c
@@ -66,7 +66,7 @@ gammaDestroyContext(__DRIcontextPrivate *driContextPriv)
       gmesa->glCtx->DriverCtx = NULL;
       _mesa_destroy_context(gmesa->glCtx);
 
-      Xfree(gmesa);
+      FREE(gmesa);
       driContextPriv->driverPrivate = NULL;
     }
 }
@@ -127,7 +127,7 @@ gammaSwapBuffers( __DRIdrawablePrivate *dPriv )
        int src, dst, x0, y0, x1, h;
        int i;
        int nRect = dPriv->numClipRects;
-       XF86DRIClipRectPtr pRect = dPriv->pClipRects;
+       drm_clip_rect_t *pRect = dPriv->pClipRects;
        __DRIscreenPrivate *driScrnPriv = gmesa->driScreen;
        GLINTDRIPtr gDRIPriv = (GLINTDRIPtr)driScrnPriv->pDevPriv;
 
@@ -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 );
     }
@@ -243,19 +238,6 @@ gammaUnbindContext( __DRIcontextPrivate *driContextPriv )
    return GL_TRUE;
 }
 
-static GLboolean
-gammaOpenFullScreen(__DRIcontextPrivate *driContextPriv)
-{
-    return GL_TRUE;
-}
-
-static GLboolean
-gammaCloseFullScreen(__DRIcontextPrivate *driContextPriv)
-{
-    return GL_TRUE;
-}
-
-
 static struct __DriverAPIRec gammaAPI = {
    gammaInitDriver,
    gammaDestroyScreen,
@@ -265,9 +247,7 @@ static struct __DriverAPIRec gammaAPI = {
    gammaDestroyBuffer,
    gammaSwapBuffers,
    gammaMakeCurrent,
-   gammaUnbindContext,
-   gammaOpenFullScreen,
-   gammaCloseFullScreen
+   gammaUnbindContext
 };
 
 
@@ -277,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)
 {
@@ -285,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