xserver: Branch 'master'

[Kristian Høgsberg]

 GL/glx/glxcmds.c    |    5 ++---
 GL/glx/glxcontext.h |   11 -----------
 GL/glx/glxdri.c     |    3 +--
 GL/glx/glxext.c     |   16 ----------------
 GL/glx/glxglcore.c  |    2 +-
 GL/glx/glxscreens.c |   11 -----------
 6 files changed, 4 insertions(+), 44 deletions(-)

New commits:
commit 497aba894904b08b15bb19916e2a163f96212a7d
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Fri Oct 26 11:25:57 2007 -0400

    Weed out some unused fluff from __GLXcontext.

diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 4a77b3e..7d352ce 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -247,7 +247,6 @@ DoCreateContext(__GLXclientState *cl, GLXContextID gcId,
     ** Initially, setup the part of the context that could be used by
     ** a GL core that needs windowing information (e.g., Mesa).
     */
-    glxc->pScreen = pGlxScreen->pScreen;
     glxc->pGlxScreen = pGlxScreen;
     glxc->modes = config;
 
@@ -497,7 +496,7 @@ __glXGetDrawable(__GLXcontext *glxc, GLXDrawable drawId, ClientPtr client,
      * a GLX drawable for it.  Check that the drawable screen matches
      * the context screen and that the context fbconfig is compatible
      * with the window visual. */
-    if (pDraw->pScreen != glxc->pScreen ||
+    if (pDraw->pScreen != glxc->pGlxScreen->pScreen ||
 	!validGlxFBConfigForWindow(client, glxc->modes, pDraw, error))
 	return NULL;
 
@@ -1470,7 +1469,7 @@ DoQueryContext(__GLXclientState *cl, GLXContextID gcId)
     *pSendBuf++ = GLX_VISUAL_ID_EXT;
     *pSendBuf++ = (int)(ctx->modes->visualID);
     *pSendBuf++ = GLX_SCREEN_EXT;
-    *pSendBuf++ = (int)(ctx->pScreen->myNum);
+    *pSendBuf++ = (int)(ctx->pGlxScreen->pScreen->myNum);
 
     if (client->swapped) {
 	__glXSwapQueryContextInfoEXTReply(client, &reply, sendBuf);
diff --git a/GL/glx/glxcontext.h b/GL/glx/glxcontext.h
index cf944a1..4c36801 100644
--- a/GL/glx/glxcontext.h
+++ b/GL/glx/glxcontext.h
@@ -85,7 +85,6 @@ struct __GLXcontext {
     ** Pointer to screen info data for this context.  This is set
     ** when the context is created.
     */
-    ScreenPtr pScreen;
     __GLXscreen *pGlxScreen;
 
     /*
@@ -99,11 +98,6 @@ struct __GLXcontext {
     XID share_id;
 
     /*
-    ** Visual id.
-    */
-    VisualID vid;
-
-    /*
     ** screen number.
     */
     GLint screen;
@@ -124,11 +118,6 @@ struct __GLXcontext {
     GLboolean isDirect;
 
     /*
-    ** Window pending state
-    */
-    GLuint pendingState;
-
-    /*
     ** This flag keeps track of whether there are unflushed GL commands.
     */
     GLboolean hasUnflushedCommands;
diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 5c45cd1..c0da07b 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -253,7 +253,7 @@ __glXDRIcontextDestroy(__GLXcontext *baseContext)
     context->driContext.destroyContext(&context->driContext);
 
     __glXenterServer(GL_FALSE);
-    retval = DRIDestroyContext(baseContext->pScreen, context->hwContextID);
+    retval = DRIDestroyContext(baseContext->pGlxScreen->pScreen, context->hwContextID);
     __glXleaveServer(GL_FALSE);
 
     __glXContextDestroy(&context->base);
@@ -587,7 +587,6 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
     context->base.loseCurrent       = __glXDRIcontextLoseCurrent;
     context->base.copy              = __glXDRIcontextCopy;
     context->base.forceCurrent      = __glXDRIcontextForceCurrent;
-    context->base.pScreen           = screen->base.pScreen;
 
     context->base.textureFromPixmap = &__glXDRItextureFromPixmap;
     /* Find the requested X visual */
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 7725389..f9b872c 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -106,22 +106,6 @@ static int ContextGone(__GLXcontext* cx, XID id)
 */
 static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
 {
-    __GLXcontext *cx, *cx1;
-
-    /*
-    ** When a drawable is destroyed, notify all context bound to 
-    ** it, that there are no longer bound to anything.
-    */
-    for (cx = glxPriv->drawGlxc; cx; cx = cx1) {
-	cx1 = cx->nextDrawPriv;
-	cx->pendingState |= __GLX_PENDING_DESTROY;
-    }
-
-    for (cx = glxPriv->readGlxc; cx; cx = cx1) {
-	cx1 = cx->nextReadPriv;
-	cx->pendingState |= __GLX_PENDING_DESTROY;
-    }
-
     glxPriv->pDraw = NULL;
     glxPriv->drawId = 0;
     __glXUnrefDrawable(glxPriv);
diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c
index 6aa4e7f..4cc00a3 100644
--- a/GL/glx/glxglcore.c
+++ b/GL/glx/glxglcore.c
@@ -363,7 +363,7 @@ createMesaVisuals(__GLXMESAscreen *pMesaScreen)
 {
     __GLcontextModes *config;
     ScreenPtr pScreen;
-    VisualPtr visual;
+    VisualPtr visual = NULL;
     int i, j;
 
     i = 0;
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index bf6ad42..3151400 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -189,7 +189,6 @@ static char GLXServerExtensions[] =
 static Bool glxPositionWindow(WindowPtr pWin, int x, int y)
 {
     ScreenPtr pScreen;
-    __GLXcontext *glxc;
     __GLXdrawable *glxPriv;
     Bool ret;
     __GLXscreen *pGlxScreen;
@@ -226,16 +225,6 @@ static Bool glxPositionWindow(WindowPtr pWin, int x, int y)
 	ret = False;
     }
 
-    /* mark contexts as needing resize */
-
-    for (glxc = glxPriv->drawGlxc; glxc; glxc = glxc->nextDrawPriv) {
-	glxc->pendingState |= __GLX_PENDING_RESIZE;
-    }
-
-    for (glxc = glxPriv->readGlxc; glxc; glxc = glxc->nextReadPriv) {
-	glxc->pendingState |= __GLX_PENDING_RESIZE;
-    }
-
     return ret;
 }