xserver: Branch 'master'

[Kristian Høgsberg]

 glx/glxcontext.h  |   16 ----------------
 glx/glxdrawable.h |    6 ------
 glx/glxext.h      |   35 -----------------------------------
 3 files changed, 57 deletions(-)

New commits:
commit 2ce434f54bc0d6050ef115e310df62c035e84bf2
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Thu Jul 24 18:44:16 2008 -0400

    Clean up unused definitions from glx headers.

diff --git a/glx/glxcontext.h b/glx/glxcontext.h
index 18d3c6f..b9d3fb1 100644
--- a/glx/glxcontext.h
+++ b/glx/glxcontext.h
@@ -69,12 +69,6 @@ struct __GLXcontext {
     __GLXcontext *next;
 
     /*
-    ** list of contexts bound to the same drawable
-    */
-    __GLXcontext *nextDrawPriv;
-    __GLXcontext *nextReadPriv;
-
-    /*
     ** config struct for this context
     */
     __GLXconfig *config;
@@ -96,11 +90,6 @@ struct __GLXcontext {
     XID share_id;
 
     /*
-    ** screen number.
-    */
-    GLint screen;
-
-    /*
     ** Whether this context's ID still exists.
     */
     GLboolean idExists;
@@ -140,11 +129,6 @@ struct __GLXcontext {
     __GLXdrawable *readPriv;
 };
 
-/* pending state defines */
-#define __GLX_PENDING_RESIZE	0x1
-#define	__GLX_PENDING_DESTROY	0x2
-#define __GLX_PENDING_SWAP	0x4
-
 void __glXContextDestroy(__GLXcontext *context);
 
 #endif /* !__GLX_context_h__ */
diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
index 6cf2e50..aaf9837 100644
--- a/glx/glxdrawable.h
+++ b/glx/glxdrawable.h
@@ -55,12 +55,6 @@ struct __GLXdrawable {
     void      (*copySubBuffer)(__GLXdrawable *drawable,
 			       int x, int y, int w, int h);
 
-    /*
-    ** list of drawable private structs
-    */
-    __GLXdrawable *last;
-    __GLXdrawable *next;
-
     DrawablePtr pDraw;
     XID drawId;
 
diff --git a/glx/glxext.h b/glx/glxext.h
index a81850c..90e61d8 100644
--- a/glx/glxext.h
+++ b/glx/glxext.h
@@ -40,29 +40,6 @@
 **
 */
 
-/*
- * Added by VA Linux for XFree86 4.0.x
- */
-typedef struct {
-    int type;
-    void (*resetExtension)(void);
-    Bool (*initVisuals)(
-        VisualPtr *       visualp,
-        DepthPtr *        depthp,
-        int *             nvisualp,
-        int *             ndepthp,
-        int *             rootDepthp,
-        VisualID *        defaultVisp,
-        unsigned long     sizes,
-        int               bitsPerRGB
-        );
-    void (*setVisualConfigs)(
-        int                nconfigs,
-        __GLXvisualConfig *configs,
-        void              **privates
-        );
-} __GLXextensionInfo;
-
 extern GLboolean __glXFreeContext(__GLXcontext *glxc);
 extern void __glXFlushContextCache(void);
 
@@ -76,17 +53,5 @@ extern void GlxExtensionInit(void);
 extern const char GLServerVersion[];
 extern int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap);
 
-extern int GlxInitVisuals(
-    VisualPtr *       visualp,
-    DepthPtr *        depthp,
-    int *             nvisualp,
-    int *             ndepthp,
-    int *             rootDepthp,
-    VisualID *        defaultVisp,
-    unsigned long     sizes,
-    int               bitsPerRGB,
-    int               preferredVis
-);
-
 #endif /* _glxext_h_ */