svn merge ^/branches/released .

1 files changed, 9 insertions, 9 deletions

diff --git a/xorg-server/glx/single2swap.c b/xorg-server/glx/single2swap.c
index f47e0aaff..b98392c29 100644
--- a/xorg-server/glx/single2swap.c
+++ b/xorg-server/glx/single2swap.c
@@ -51,7 +51,7 @@ int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
     GLsizei size;

     GLenum type;

     __GLX_DECLARE_SWAP_VARIABLES;

-    struct glx_context *cx;

+    __GLXcontext *cx;

     int error;

 

     __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);

@@ -76,13 +76,13 @@ int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
 	cx->feedbackBufSize = size;

     }

     CALL_FeedbackBuffer( GET_DISPATCH(), (size, type, cx->feedbackBuf) );

-    __GLX_NOTE_UNFLUSHED_CMDS(cx);

+    cx->hasUnflushedCommands = GL_TRUE;

     return Success;

 }

 

 int __glXDispSwap_SelectBuffer(__GLXclientState *cl, GLbyte *pc)

 {

-    struct glx_context *cx;

+    __GLXcontext *cx;

     GLsizei size;

     __GLX_DECLARE_SWAP_VARIABLES;

     int error;

@@ -107,14 +107,14 @@ int __glXDispSwap_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
 	cx->selectBufSize = size;

     }

     CALL_SelectBuffer( GET_DISPATCH(), (size, cx->selectBuf) );

-    __GLX_NOTE_UNFLUSHED_CMDS(cx);

+    cx->hasUnflushedCommands = GL_TRUE;

     return Success;

 }

 

 int __glXDispSwap_RenderMode(__GLXclientState *cl, GLbyte *pc)

 {

     ClientPtr client;

-    struct glx_context *cx;

+    __GLXcontext *cx;

     xGLXRenderModeReply reply;

     GLint nitems=0, retBytes=0, retval, newModeCheck;

     GLubyte *retBuffer = NULL;

@@ -222,7 +222,7 @@ int __glXDispSwap_RenderMode(__GLXclientState *cl, GLbyte *pc)
 

 int __glXDispSwap_Flush(__GLXclientState *cl, GLbyte *pc)

 {

-	struct glx_context *cx;

+	__GLXcontext *cx;

 	int error;

 	__GLX_DECLARE_SWAP_VARIABLES;

 

@@ -233,13 +233,13 @@ int __glXDispSwap_Flush(__GLXclientState *cl, GLbyte *pc)
 	}

 

 	CALL_Flush( GET_DISPATCH(), () );

-	__GLX_NOTE_FLUSHED_CMDS(cx);

+	cx->hasUnflushedCommands = GL_FALSE;

 	return Success;

 }

 

 int __glXDispSwap_Finish(__GLXclientState *cl, GLbyte *pc)

 {

-    struct glx_context *cx;

+    __GLXcontext *cx;

     ClientPtr client;

     int error;

     __GLX_DECLARE_SWAP_VARIABLES;

@@ -252,7 +252,7 @@ int __glXDispSwap_Finish(__GLXclientState *cl, GLbyte *pc)
 

     /* Do a local glFinish */

     CALL_Finish( GET_DISPATCH(), () );

-    __GLX_NOTE_FLUSHED_CMDS(cx);

+    cx->hasUnflushedCommands = GL_FALSE;

 

     /* Send empty reply packet to indicate finish is finished */

     client = cl->client;