andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Weed out some unused fluff from __GLXcontext.

Browse Source
This commit is contained in:
Kristian Høgsberg 2007-10-26 11:25:57 -04:00
parent 0e749ceab4
commit 497aba8949
6 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GL/glx/glxcmds.c
View File

@ -247,7 +247,6 @@ DoCreateContext(__GLXclientState *cl, GLXContextID gcId,
** Initially, setup the part of the context that could be used by ** Initially, setup the part of the context that could be used by
** a GL core that needs windowing information (e.g., Mesa). ** a GL core that needs windowing information (e.g., Mesa).
*/ */
glxc->pScreen = pGlxScreen->pScreen;
glxc->pGlxScreen = pGlxScreen; glxc->pGlxScreen = pGlxScreen;
glxc->modes = config; 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 * a GLX drawable for it. Check that the drawable screen matches
* the context screen and that the context fbconfig is compatible * the context screen and that the context fbconfig is compatible
* with the window visual. */ * with the window visual. */
if (pDraw->pScreen != glxc->pScreen || if (pDraw->pScreen != glxc->pGlxScreen->pScreen ||
!validGlxFBConfigForWindow(client, glxc->modes, pDraw, error)) !validGlxFBConfigForWindow(client, glxc->modes, pDraw, error))
return NULL; return NULL;
@ -1470,7 +1469,7 @@ DoQueryContext(__GLXclientState *cl, GLXContextID gcId)
*pSendBuf++ = GLX_VISUAL_ID_EXT; *pSendBuf++ = GLX_VISUAL_ID_EXT;
*pSendBuf++ = (int)(ctx->modes->visualID); *pSendBuf++ = (int)(ctx->modes->visualID);
*pSendBuf++ = GLX_SCREEN_EXT; *pSendBuf++ = GLX_SCREEN_EXT;
*pSendBuf++ = (int)(ctx->pScreen->myNum); *pSendBuf++ = (int)(ctx->pGlxScreen->pScreen->myNum);
if (client->swapped) { if (client->swapped) {
__glXSwapQueryContextInfoEXTReply(client, &reply, sendBuf); __glXSwapQueryContextInfoEXTReply(client, &reply, sendBuf);

11
GL/glx/glxcontext.h
View File

@ -85,7 +85,6 @@ struct __GLXcontext {
** Pointer to screen info data for this context. This is set ** Pointer to screen info data for this context. This is set
** when the context is created. ** when the context is created.
*/ */
ScreenPtr pScreen;
__GLXscreen *pGlxScreen; __GLXscreen *pGlxScreen;
/* /*
@ -98,11 +97,6 @@ struct __GLXcontext {
*/ */
XID share_id; XID share_id;
/*
** Visual id.
*/
VisualID vid;
/* /*
** screen number. ** screen number.
*/ */
@ -123,11 +117,6 @@ struct __GLXcontext {
*/ */
GLboolean isDirect; GLboolean isDirect;
/*
** Window pending state
*/
GLuint pendingState;
/* /*
** This flag keeps track of whether there are unflushed GL commands. ** This flag keeps track of whether there are unflushed GL commands.
*/ */

3
GL/glx/glxdri.c
View File

@ -253,7 +253,7 @@ __glXDRIcontextDestroy(__GLXcontext *baseContext)
context->driContext.destroyContext(&context->driContext); context->driContext.destroyContext(&context->driContext);
__glXenterServer(GL_FALSE); __glXenterServer(GL_FALSE);
retval = DRIDestroyContext(baseContext->pScreen, context->hwContextID); retval = DRIDestroyContext(baseContext->pGlxScreen->pScreen, context->hwContextID);
__glXleaveServer(GL_FALSE); __glXleaveServer(GL_FALSE);
__glXContextDestroy(&context->base); __glXContextDestroy(&context->base);
@ -587,7 +587,6 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
context->base.loseCurrent = __glXDRIcontextLoseCurrent; context->base.loseCurrent = __glXDRIcontextLoseCurrent;
context->base.copy = __glXDRIcontextCopy; context->base.copy = __glXDRIcontextCopy;
context->base.forceCurrent = __glXDRIcontextForceCurrent; context->base.forceCurrent = __glXDRIcontextForceCurrent;
context->base.pScreen = screen->base.pScreen;
context->base.textureFromPixmap = &__glXDRItextureFromPixmap; context->base.textureFromPixmap = &__glXDRItextureFromPixmap;
/* Find the requested X visual */ /* Find the requested X visual */

16
GL/glx/glxext.c
View File

@ -106,22 +106,6 @@ static int ContextGone(__GLXcontext* cx, XID id)
*/ */
static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid) 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->pDraw = NULL;
glxPriv->drawId = 0; glxPriv->drawId = 0;
__glXUnrefDrawable(glxPriv); __glXUnrefDrawable(glxPriv);

2
GL/glx/glxglcore.c
View File

@ -363,7 +363,7 @@ createMesaVisuals(__GLXMESAscreen *pMesaScreen)
{ {
__GLcontextModes *config; __GLcontextModes *config;
ScreenPtr pScreen; ScreenPtr pScreen;
VisualPtr visual; VisualPtr visual = NULL;
int i, j; int i, j;
i = 0; i = 0;

11
GL/glx/glxscreens.c
View File

@ -189,7 +189,6 @@ static char GLXServerExtensions[] =
static Bool glxPositionWindow(WindowPtr pWin, int x, int y) static Bool glxPositionWindow(WindowPtr pWin, int x, int y)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
__GLXcontext *glxc;
__GLXdrawable *glxPriv; __GLXdrawable *glxPriv;
Bool ret; Bool ret;
__GLXscreen *pGlxScreen; __GLXscreen *pGlxScreen;
@ -226,16 +225,6 @@ static Bool glxPositionWindow(WindowPtr pWin, int x, int y)
ret = False; 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; return ret;
} }