xserver: Branch 'master'

[Jeremy Huddleston]

 hw/xquartz/GL/indirect.c |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit a8e634b86d47353ef354717904fa66ebe35e1303
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 31 15:53:58 2009 -0700

    XQuartz: GLX: Drawable does not contain resize anymore.
    (cherry picked from commit 1e642f22fbf029bb3917091cb5fa2f78b4a92f62)

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index f9d69f7..1762825 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -471,13 +471,6 @@ static int __glXAquaContextForceCurrent(__GLXcontext *baseContext)
 }
 
 /* Drawing surface notification callbacks */
-
-static GLboolean __glXAquaDrawableResize(__GLXdrawable *base)  {
-    // Don't remove, <rdar://problem/7114913>
-    GLAQUA_DEBUG_MSG("unimplemented glAquaDrawableResize\n");
-    return GL_TRUE;
-}
-
 static GLboolean __glXAquaDrawableSwapBuffers(__GLXdrawable *base) {
     CGLError err;
     __GLXAquaDrawable *drawable;
@@ -664,7 +657,6 @@ __glXAquaScreenCreateDrawable(__GLXscreen *screen,
   }
 
   glxPriv->base.destroy       = __glXAquaDrawableDestroy;
-  glxPriv->base.resize        = __glXAquaDrawableResize;
   glxPriv->base.swapBuffers   = __glXAquaDrawableSwapBuffers;
   glxPriv->base.copySubBuffer = NULL; /* __glXAquaDrawableCopySubBuffer; */