xserver git update 11/6/2010

1 files changed, 14 insertions, 5 deletions

diff --git a/xorg-server/hw/dmx/glxProxy/glxsingle.c b/xorg-server/hw/dmx/glxProxy/glxsingle.c
index 8325b4afc..056c74066 100644
--- a/xorg-server/hw/dmx/glxProxy/glxsingle.c
+++ b/xorg-server/hw/dmx/glxProxy/glxsingle.c
@@ -397,6 +397,7 @@ int __glXForwardSingleReqSwap( __GLXclientState *cl, GLbyte *pc )
 {

    xGLXSingleReq *req = (xGLXSingleReq *)pc;

    __GLX_DECLARE_SWAP_VARIABLES;

+   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

 

    __GLX_SWAP_SHORT(&req->length);

    __GLX_SWAP_INT(&req->contextTag);

@@ -420,6 +421,7 @@ int __glXForwardPipe0WithReplySwap( __GLXclientState *cl, GLbyte *pc )
 {

    xGLXSingleReq *req = (xGLXSingleReq *)pc;

    __GLX_DECLARE_SWAP_VARIABLES;

+   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

 

    __GLX_SWAP_SHORT(&req->length);

    __GLX_SWAP_INT(&req->contextTag);

@@ -443,6 +445,7 @@ int __glXForwardPipe0WithReplySwapsv( __GLXclientState *cl, GLbyte *pc )
 {

    xGLXSingleReq *req = (xGLXSingleReq *)pc;

    __GLX_DECLARE_SWAP_VARIABLES;

+   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

 

    __GLX_SWAP_SHORT(&req->length);

    __GLX_SWAP_INT(&req->contextTag);

@@ -467,6 +470,7 @@ int __glXForwardPipe0WithReplySwapiv( __GLXclientState *cl, GLbyte *pc )
 {

    xGLXSingleReq *req = (xGLXSingleReq *)pc;

    __GLX_DECLARE_SWAP_VARIABLES;

+   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

 

    __GLX_SWAP_SHORT(&req->length);

    __GLX_SWAP_INT(&req->contextTag);

@@ -491,6 +495,7 @@ int __glXForwardPipe0WithReplySwapdv( __GLXclientState *cl, GLbyte *pc )
 {

    xGLXSingleReq *req = (xGLXSingleReq *)pc;

    __GLX_DECLARE_SWAP_VARIABLES;

+   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

 

    __GLX_SWAP_SHORT(&req->length);

    __GLX_SWAP_INT(&req->contextTag);

@@ -515,6 +520,7 @@ int __glXForwardAllWithReplySwap( __GLXclientState *cl, GLbyte *pc )
 {

    xGLXSingleReq *req = (xGLXSingleReq *)pc;

    __GLX_DECLARE_SWAP_VARIABLES;

+   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

 

    __GLX_SWAP_SHORT(&req->length);

    __GLX_SWAP_INT(&req->contextTag);

@@ -539,6 +545,7 @@ int __glXForwardAllWithReplySwapsv( __GLXclientState *cl, GLbyte *pc )
 {

    xGLXSingleReq *req = (xGLXSingleReq *)pc;

    __GLX_DECLARE_SWAP_VARIABLES;

+   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

 

    __GLX_SWAP_SHORT(&req->length);

    __GLX_SWAP_INT(&req->contextTag);

@@ -563,6 +570,7 @@ int __glXForwardAllWithReplySwapiv( __GLXclientState *cl, GLbyte *pc )
 {

    xGLXSingleReq *req = (xGLXSingleReq *)pc;

    __GLX_DECLARE_SWAP_VARIABLES;

+   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

 

    __GLX_SWAP_SHORT(&req->length);

    __GLX_SWAP_INT(&req->contextTag);

@@ -587,6 +595,7 @@ int __glXForwardAllWithReplySwapdv( __GLXclientState *cl, GLbyte *pc )
 {

    xGLXSingleReq *req = (xGLXSingleReq *)pc;

    __GLX_DECLARE_SWAP_VARIABLES;

+   __GLX_DECLARE_SWAP_ARRAY_VARIABLES;

 

    __GLX_SWAP_SHORT(&req->length);

    __GLX_SWAP_INT(&req->contextTag);

@@ -659,7 +668,7 @@ static GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h,
 	   }

 	   if (elementbits_return) *elementbits_return = elements;

 	   if (rowbytes_return) *rowbytes_return = rowsize;

-	   return (rowsize * h);

+	   return rowsize * h;

 	} else {

 	   return -1;

 	}

@@ -709,7 +718,7 @@ static GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h,
     if (elementbits_return) *elementbits_return = esize*elements*8;

     if (rowbytes_return) *rowbytes_return = rowsize;

 

-    return (rowsize * h);

+    return rowsize * h;

 }

 

 static int intersectRect( int x1, int x2, int y1, int y2,

@@ -725,14 +734,14 @@ static int intersectRect( int x1, int x2, int y1, int y2,
 

    if ( (width <= 0) || (height <= 0) ) {

       *ix1 = *ix2 = *iy1 = *iy2 = 0;

-      return(0);

+      return 0;

    }

    else {

       *ix1 = left;

       *ix2 = right;

       *iy1 = top;

       *iy2 = bottom;

-      return( width * height );

+      return width * height;

    }

 

 }

@@ -802,7 +811,7 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
     if (buf_size > 0) {

        buf = (char *) malloc( buf_size );

        if ( !buf ) {

-	  return( BadAlloc );

+	  return BadAlloc;

        }

     }

     else {