Merging XORG-CURRENT into trunk

1 files changed, 37 insertions, 1 deletions

diff --git a/GL/glx/g_singleswap.c b/GL/glx/g_singleswap.c
index 5efcbe535..71722e57f 100644
--- a/GL/glx/g_singleswap.c
+++ b/GL/glx/g_singleswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.6 2004/03/10 18:08:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.4tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -234,6 +234,7 @@ int __glXDispSwap_GetDoublev(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLdouble answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -311,6 +312,7 @@ int __glXDispSwap_GetFloatv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -363,6 +365,7 @@ int __glXDispSwap_GetIntegerv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -415,6 +418,7 @@ int __glXDispSwap_GetLightfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -469,6 +473,7 @@ int __glXDispSwap_GetLightiv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -524,6 +529,7 @@ int __glXDispSwap_GetMapdv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLdouble answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -580,6 +586,7 @@ int __glXDispSwap_GetMapfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -636,6 +643,7 @@ int __glXDispSwap_GetMapiv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -691,6 +699,7 @@ int __glXDispSwap_GetMaterialfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -745,6 +754,7 @@ int __glXDispSwap_GetMaterialiv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -799,6 +809,7 @@ int __glXDispSwap_GetPixelMapfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -851,6 +862,7 @@ int __glXDispSwap_GetPixelMapuiv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLuint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -903,6 +915,7 @@ int __glXDispSwap_GetPixelMapusv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLushort answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -955,6 +968,7 @@ int __glXDispSwap_GetTexEnvfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1009,6 +1023,7 @@ int __glXDispSwap_GetTexEnviv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1063,6 +1078,7 @@ int __glXDispSwap_GetTexGendv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLdouble answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1117,6 +1133,7 @@ int __glXDispSwap_GetTexGenfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1171,6 +1188,7 @@ int __glXDispSwap_GetTexGeniv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1225,6 +1243,7 @@ int __glXDispSwap_GetTexParameterfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1279,6 +1298,7 @@ int __glXDispSwap_GetTexParameteriv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1333,6 +1353,7 @@ int __glXDispSwap_GetTexLevelParameterfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1389,6 +1410,7 @@ int __glXDispSwap_GetTexLevelParameteriv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1501,6 +1523,7 @@ int __glXDispSwap_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLboolean answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1534,6 +1557,7 @@ int __glXDispSwap_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
 	GLsizei n;
 	__GLXcontext *cx;
 	int error;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1561,6 +1585,7 @@ int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLuint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1622,6 +1647,7 @@ int __glXDispSwap_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1676,6 +1702,7 @@ int __glXDispSwap_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1730,6 +1757,7 @@ int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1784,6 +1812,7 @@ int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1838,6 +1867,7 @@ int __glXDispSwap_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1892,6 +1922,7 @@ int __glXDispSwap_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -1946,6 +1977,7 @@ int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLfloat answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -2000,6 +2032,7 @@ int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -2054,6 +2087,7 @@ int __glXDispSwap_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLboolean answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXVendorPrivateReq *)pc)->contextTag);
@@ -2087,6 +2121,7 @@ int __glXDispSwap_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
 	GLsizei n;
 	__GLXcontext *cx;
 	int error;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXVendorPrivateReq *)pc)->contextTag);
@@ -2114,6 +2149,7 @@ int __glXDispSwap_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc)
 	int error;
 	GLuint answerBuffer[200];
 	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
 
 	__GLX_SWAP_INT(&((xGLXVendorPrivateReq *)pc)->contextTag);