frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Remove some obfuscatory macros 

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2011-03-18 17:44:11 -04:00
parent c327d07cc6
commit 10317682e2
8 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glx/glxcmds.c
View File

@ -586,10 +586,10 @@ DoMakeCurrent(__GLXclientState *cl,
/* /*
** Flush the previous context if needed. ** Flush the previous context if needed.
*/ */
if (__GLX_HAS_UNFLUSHED_CMDS(prevglxc)) { if (prevglxc->hasUnflushedCommands) {
if (__glXForceCurrent(cl, tag, (int *)&error)) { if (__glXForceCurrent(cl, tag, (int *)&error)) {
CALL_Flush( GET_DISPATCH(), () ); CALL_Flush( GET_DISPATCH(), () );
__GLX_NOTE_FLUSHED_CMDS(prevglxc); prevglxc->hasUnflushedCommands = GL_FALSE;
} else { } else {
return error; return error;
} }
@ -855,7 +855,7 @@ int __glXDisp_CopyContext(__GLXclientState *cl, GLbyte *pc)
** in both streams are completed before the copy is executed. ** in both streams are completed before the copy is executed.
*/ */
CALL_Finish( GET_DISPATCH(), () ); CALL_Finish( GET_DISPATCH(), () );
__GLX_NOTE_FLUSHED_CMDS(tagcx); tagcx->hasUnflushedCommands = GL_FALSE;
} else { } else {
return error; return error;
} }
@ -1566,7 +1566,7 @@ int __glXDisp_SwapBuffers(__GLXclientState *cl, GLbyte *pc)
** in both streams are completed before the swap is executed. ** in both streams are completed before the swap is executed.
*/ */
CALL_Finish( GET_DISPATCH(), () ); CALL_Finish( GET_DISPATCH(), () );
__GLX_NOTE_FLUSHED_CMDS(glxc); glxc->hasUnflushedCommands = GL_FALSE;
} else { } else {
return error; return error;
} }
@ -1765,7 +1765,7 @@ int __glXDisp_CopySubBufferMESA(__GLXclientState *cl, GLbyte *pc)
** in both streams are completed before the swap is executed. ** in both streams are completed before the swap is executed.
*/ */
CALL_Finish( GET_DISPATCH(), () ); CALL_Finish( GET_DISPATCH(), () );
__GLX_NOTE_FLUSHED_CMDS(glxc); glxc->hasUnflushedCommands = GL_FALSE;
} else { } else {
return error; return error;
} }
@ -1952,7 +1952,7 @@ int __glXDisp_Render(__GLXclientState *cl, GLbyte *pc)
left -= cmdlen; left -= cmdlen;
commandsDone++; commandsDone++;
} }
__GLX_NOTE_UNFLUSHED_CMDS(glxc); glxc->hasUnflushedCommands = GL_TRUE;
return Success; return Success;
} }
@ -2149,7 +2149,7 @@ int __glXDisp_RenderLarge(__GLXclientState *cl, GLbyte *pc)
** Skip over the header and execute the command. ** Skip over the header and execute the command.
*/ */
(*proc)(cl->largeCmdBuf + __GLX_RENDER_LARGE_HDR_SIZE); (*proc)(cl->largeCmdBuf + __GLX_RENDER_LARGE_HDR_SIZE);
__GLX_NOTE_UNFLUSHED_CMDS(glxc); glxc->hasUnflushedCommands = GL_TRUE;
/* /*
** Reset for the next RenderLarge series. ** Reset for the next RenderLarge series.

8
glx/glxserver.h
View File

@ -100,14 +100,6 @@ extern ClientPtr __pGlxClient;
int __glXError(int error); int __glXError(int error);
/*
** Macros to set, unset, and retrieve the flag that says whether a context
** has unflushed commands.
*/
#define __GLX_NOTE_UNFLUSHED_CMDS(glxc) glxc->hasUnflushedCommands = GL_TRUE
#define __GLX_NOTE_FLUSHED_CMDS(glxc) glxc->hasUnflushedCommands = GL_FALSE
#define __GLX_HAS_UNFLUSHED_CMDS(glxc) (glxc->hasUnflushedCommands)
/************************************************************************/ /************************************************************************/
typedef struct __GLXprovider __GLXprovider; typedef struct __GLXprovider __GLXprovider;

8
glx/single2.c
View File

@ -72,7 +72,7 @@ int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
cx->feedbackBufSize = size; cx->feedbackBufSize = size;
} }
CALL_FeedbackBuffer( GET_DISPATCH(), (size, type, cx->feedbackBuf) ); CALL_FeedbackBuffer( GET_DISPATCH(), (size, type, cx->feedbackBuf) );
__GLX_NOTE_UNFLUSHED_CMDS(cx); cx->hasUnflushedCommands = GL_TRUE;
return Success; return Success;
} }
@ -100,7 +100,7 @@ int __glXDisp_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
cx->selectBufSize = size; cx->selectBufSize = size;
} }
CALL_SelectBuffer( GET_DISPATCH(), (size, cx->selectBuf) ); CALL_SelectBuffer( GET_DISPATCH(), (size, cx->selectBuf) );
__GLX_NOTE_UNFLUSHED_CMDS(cx); cx->hasUnflushedCommands = GL_TRUE;
return Success; return Success;
} }
@ -213,7 +213,7 @@ int __glXDisp_Flush(__GLXclientState *cl, GLbyte *pc)
} }
CALL_Flush( GET_DISPATCH(), () ); CALL_Flush( GET_DISPATCH(), () );
__GLX_NOTE_FLUSHED_CMDS(cx); cx->hasUnflushedCommands = GL_FALSE;
return Success; return Success;
} }
@ -230,7 +230,7 @@ int __glXDisp_Finish(__GLXclientState *cl, GLbyte *pc)
/* Do a local glFinish */ /* Do a local glFinish */
CALL_Finish( GET_DISPATCH(), () ); CALL_Finish( GET_DISPATCH(), () );
__GLX_NOTE_FLUSHED_CMDS(cx); cx->hasUnflushedCommands = GL_FALSE;
/* Send empty reply packet to indicate finish is finished */ /* Send empty reply packet to indicate finish is finished */
client = cl->client; client = cl->client;

8
glx/single2swap.c
View File

@ -72,7 +72,7 @@ int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
cx->feedbackBufSize = size; cx->feedbackBufSize = size;
} }
CALL_FeedbackBuffer( GET_DISPATCH(), (size, type, cx->feedbackBuf) ); CALL_FeedbackBuffer( GET_DISPATCH(), (size, type, cx->feedbackBuf) );
__GLX_NOTE_UNFLUSHED_CMDS(cx); cx->hasUnflushedCommands = GL_TRUE;
return Success; return Success;
} }
@ -103,7 +103,7 @@ int __glXDispSwap_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
cx->selectBufSize = size; cx->selectBufSize = size;
} }
CALL_SelectBuffer( GET_DISPATCH(), (size, cx->selectBuf) ); CALL_SelectBuffer( GET_DISPATCH(), (size, cx->selectBuf) );
__GLX_NOTE_UNFLUSHED_CMDS(cx); cx->hasUnflushedCommands = GL_TRUE;
return Success; return Success;
} }
@ -229,7 +229,7 @@ int __glXDispSwap_Flush(__GLXclientState *cl, GLbyte *pc)
} }
CALL_Flush( GET_DISPATCH(), () ); CALL_Flush( GET_DISPATCH(), () );
__GLX_NOTE_FLUSHED_CMDS(cx); cx->hasUnflushedCommands = GL_FALSE;
return Success; return Success;
} }
@ -248,7 +248,7 @@ int __glXDispSwap_Finish(__GLXclientState *cl, GLbyte *pc)
/* Do a local glFinish */ /* Do a local glFinish */
CALL_Finish( GET_DISPATCH(), () ); CALL_Finish( GET_DISPATCH(), () );
__GLX_NOTE_FLUSHED_CMDS(cx); cx->hasUnflushedCommands = GL_FALSE;
/* Send empty reply packet to indicate finish is finished */ /* Send empty reply packet to indicate finish is finished */
client = cl->client; client = cl->client;

2
glx/singlepix.c
View File

@ -91,7 +91,7 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
__GLX_SEND_HEADER(); __GLX_SEND_HEADER();
__GLX_SEND_VOID_ARRAY(compsize); __GLX_SEND_VOID_ARRAY(compsize);
} }
__GLX_NOTE_FLUSHED_CMDS(cx); cx->hasUnflushedCommands = GL_FALSE;
return Success; return Success;
} }

2
glx/singlepixswap.c
View File

@ -102,7 +102,7 @@ int __glXDispSwap_ReadPixels(__GLXclientState *cl, GLbyte *pc)
__GLX_SEND_HEADER(); __GLX_SEND_HEADER();
__GLX_SEND_VOID_ARRAY(compsize); __GLX_SEND_VOID_ARRAY(compsize);
} }
__GLX_NOTE_FLUSHED_CMDS(cx); cx->hasUnflushedCommands = GL_FALSE;
return Success; return Success;
} }

8
hw/dmx/glxProxy/glxserver.h
View File

@ -92,14 +92,6 @@ extern GLint __glXNumActiveScreens;
extern __GLXcontext *__glXLastContext; extern __GLXcontext *__glXLastContext;
extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*); extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*);
/*
** Macros to set, unset, and retrieve the flag that says whether a context
** has unflushed commands.
*/
#define __GLX_NOTE_UNFLUSHED_CMDS(glxc) glxc->hasUnflushedCommands = GL_TRUE
#define __GLX_NOTE_FLUSHED_CMDS(glxc) glxc->hasUnflushedCommands = GL_FALSE
#define __GLX_HAS_UNFLUSHED_CMDS(glxc) (glxc->hasUnflushedCommands)
/************************************************************************/ /************************************************************************/
typedef struct { typedef struct {

2
hw/xwin/glx/indirect.c
View File

@ -859,7 +859,7 @@ glxWinDrawableDestroy(__GLXdrawable *base)
// on the next context change) // on the next context change)
// (GLX core considers it an error when we try to select a new current context if the old one // (GLX core considers it an error when we try to select a new current context if the old one
// has unflushed commands, but the window has disappeared..) // has unflushed commands, but the window has disappeared..)
__GLX_NOTE_FLUSHED_CMDS(__glXLastContext); __glXLastContext->hasUnflushedCommands = FALSE;
__glXLastContext = NULL; __glXLastContext = NULL;
} }