xserver: Branch 'server-1.2-branch' - 2 commits

[Eric Anholt]

 hw/dmx/glxProxy/glxdrawable.h |   52 ------------------------------------------
 hw/dmx/glxProxy/glxserver.h   |    3 --
 randr/rrcrtc.c                |    2 -
 3 files changed, 1 insertion(+), 56 deletions(-)

New commits:
diff-tree fe13ebbe6960b5a23ed0dc0dd991fd5177dee483 (from ec1c2fc092ac18c8c0f4ef84d74869398844719d)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Feb 2 12:14:40 2007 -0800

    Fix the size expectations of xRRSetCrtcGamma.
    
    It was using REQUEST_SIZE_MATCH (client request length must equal request size)
    rather than REQUEST_AT_LEAST_SIZE (client request length must be at least
    big enough for request size), and this request has data following the request
    structure.
    (cherry picked from commit 4f2f3233c808fd86bf9f6c09937feda9e0b367fd)

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 1e04290..2ae9040 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -868,7 +868,7 @@ ProcRRSetCrtcGamma (ClientPtr client)
     unsigned long		len;
     CARD16			*red, *green, *blue;
     
-    REQUEST_SIZE_MATCH(xRRSetCrtcGammaReq);
+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcGammaReq);
     crtc = LookupCrtc (client, stuff->crtc, SecurityWriteAccess);
     if (!crtc)
 	return RRErrorBase + BadRRCrtc;
diff-tree ec1c2fc092ac18c8c0f4ef84d74869398844719d (from 8798c8cfa888521cc47173bf6db00b5724da4a54)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date:   Fri Feb 2 12:57:38 2007 +0200

    dmx: drop leftover __GLXdrawablePrivateRec struct.
    (cherry picked from commit cf5b29d75dad7c74543f49f010c817623a3df747)

diff --git a/hw/dmx/glxProxy/glxdrawable.h b/hw/dmx/glxProxy/glxdrawable.h
index 59fffa7..baed683 100644
--- a/hw/dmx/glxProxy/glxdrawable.h
+++ b/hw/dmx/glxProxy/glxdrawable.h
@@ -49,58 +49,6 @@ typedef struct {
 
 } __GLXpixmap;
 
-struct __GLXdrawablePrivateRec {
-    /*
-    ** list of drawable private structs
-    */
-    struct __GLXdrawablePrivateRec *last;
-    struct __GLXdrawablePrivateRec *next;
-
-    DrawablePtr pDraw;
-    XID drawId;
-    __GLXpixmap *pGlxPixmap;
-
-    /*
-    ** Either DRAWABLE_PIXMAP or DRAWABLE_WINDOW, copied from pDraw above.
-    ** Needed by the resource freer because pDraw might already have been
-    ** freed.
-    */
-    int type;
-
-    /*
-    ** Configuration of the visual to which this drawable was created.
-    */
-    __GLXvisualConfig *pGlxVisual;
-
-    /*
-    ** cached drawable size and origin
-    */
-    GLint xorigin, yorigin;
-    GLint width, height;
-
-    /*
-    ** list of contexts bound to this drawable
-    */
-    struct __GLXcontextRec *glxc;
-
-    /*
-    ** "methods" that the drawble should be able to respond to.
-    */
-    void (*freeBuffers)(struct __GLXdrawablePrivateRec *);
-    void (*updatePalette)(struct __GLXdrawablePrivateRec *);
-    GLboolean (*swapBuffers)(struct __GLXdrawablePrivateRec *);
-
-    /*
-    ** The GL drawable (information shared between GLX and the GL core)
-    */
-    __GLdrawablePrivate glPriv;
-
-    /*
-    ** reference count
-    */
-    int refCount;
-};
-
 typedef struct {
     DrawablePtr pDraw;
     int type;
diff --git a/hw/dmx/glxProxy/glxserver.h b/hw/dmx/glxProxy/glxserver.h
index db5be43..021d4c1 100644
--- a/hw/dmx/glxProxy/glxserver.h
+++ b/hw/dmx/glxProxy/glxserver.h
@@ -58,9 +58,6 @@
 #include <GL/glxproto.h>
 #include <GL/glxint.h>
 
-/* For glxscreens.h */
-typedef struct __GLXdrawablePrivateRec __GLXdrawablePrivate;
-
 #include "glxscreens.h"
 #include "glxdrawable.h"
 #include "glxcontext.h"