On Tue, Jan 11, 2005 at 02:15:58PM -0700, Marc Aurele La France wrote:
> On Tue, 11 Jan 2005, Marc Aurele La France wrote:
> >On Tue, 11 Jan 2005, Kevin E Martin wrote:
> >>Here's an explanation of the issue with a proposed fix to maintain
> >>backward compatibility:
>
> >> http://sourceforge.net/mailarchive/message.php?msg_id=10290987
>
> >>I've tested my patch to make sure that it works fine on Linux. I don't
> >>have an SGI box to verify that it still works fine on their systems.
>
> >Well, if I were you, I'd commit something like that ASAP. I can deal with
> >the build issues, test case or no test case. The point being that no one
> >will fix it if it doesn't build.
>
> >Longer term though, we need to look at glxProxy being more of an #ifdef'ed
> >derivative of GLX.
>
> Come to think of it, I'll be even blunter. If DMX breaks every time GLX is
> resync'ed, then there's no point in keeping DMX.
glxProxy was developed by SGI is almost 100% independent from GLX as
used in the rest of the X server -- the only shared code is from some
header files. One of those headers was changed but not properly
#ifdef'd by SGI to maintain backward compatibility with previous XFree86
releases. The patch that I suggested fixes the backward compatibility
issue. This is all explained in the thread that I referenced in my
previous message.
Unfortunately, I just discovered that there is a much more significant
issue: you've made changes to glxProxy on 4 Aug 2004 that broke the
build. I've attached a patch to make it build again. However, I cannot
verify the correctness of the changes you've made, since glxProxy is not
my code. As I mentioned above, the code was donated by SGI. I would
strongly suggest reverting the changes you've made until you can verify
with SGI that your changes are correct.
If you do revert the changes back to the way they were originally
checked in and then apply the patch from my message to the dri-devel
list (see URL above), then glxProxy should build and work properly, and
it should also be backward compatible with previous XFree86 releases.
Index: programs/Xserver/hw/dmx/dmx_glxvisuals.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/dmx/dmx_glxvisuals.c,v
retrieving revision 1.1
diff -u -r1.1 dmx_glxvisuals.c
--- programs/Xserver/hw/dmx/dmx_glxvisuals.c 30 Jun 2004 20:21:38 -0000
1.1
+++ programs/Xserver/hw/dmx/dmx_glxvisuals.c 12 Jan 2005 00:13:53 -0000
@@ -147,12 +147,14 @@
int value = *p++;
switch (property) {
+#if 0
case GLX_SAMPLES_SGIS:
config->multiSampleSize = value;
break;
case GLX_SAMPLE_BUFFERS_SGIS:
config->nMultiSampleBuffers = value;
break;
+#endif
case GLX_TRANSPARENT_TYPE_EXT:
config->transparentPixel = value;
@@ -177,10 +179,12 @@
config->visualRating = value;
break;
+#if 0
/* visualSelectGroup is an internal used property */
case GLX_VISUAL_SELECT_GROUP_SGIX:
config->visualSelectGroup = value;
break;
+#endif
default :
/* Ignore properties we don't recognize */
@@ -591,9 +595,11 @@
cfg->transparentBlue = fbcfg->transparentBlue;
cfg->transparentAlpha = fbcfg->transparentAlpha;
cfg->transparentIndex = fbcfg->transparentIndex;
+#if 0
cfg->multiSampleSize = fbcfg->multiSampleSize;
cfg->nMultiSampleBuffers = fbcfg->nMultiSampleBuffers;
cfg->visualSelectGroup = fbcfg->visualSelectGroup;
+#endif
}
}
Index: programs/Xserver/hw/dmx/glxProxy/g_renderswap.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/dmx/glxProxy/g_renderswap.c,v
retrieving revision 1.2
diff -u -r1.2 g_renderswap.c
--- programs/Xserver/hw/dmx/glxProxy/g_renderswap.c 4 Aug 2004 16:33:34
-0000 1.2
+++ programs/Xserver/hw/dmx/glxProxy/g_renderswap.c 12 Jan 2005 00:13:53
-0000
@@ -63,6 +63,7 @@
void __glXDispSwap_Color3dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -76,6 +77,7 @@
void __glXDispSwap_Color3fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
@@ -83,6 +85,7 @@
void __glXDispSwap_Color3iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -90,6 +93,7 @@
void __glXDispSwap_Color3sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -102,6 +106,7 @@
void __glXDispSwap_Color3uiv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -109,6 +114,7 @@
void __glXDispSwap_Color3usv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -121,6 +127,7 @@
void __glXDispSwap_Color4dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -134,6 +141,7 @@
void __glXDispSwap_Color4fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
@@ -141,6 +149,7 @@
void __glXDispSwap_Color4iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 4);
@@ -148,6 +157,7 @@
void __glXDispSwap_Color4sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
@@ -160,6 +170,7 @@
void __glXDispSwap_Color4uiv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 4);
@@ -167,6 +178,7 @@
void __glXDispSwap_Color4usv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
@@ -184,6 +196,7 @@
void __glXDispSwap_Indexdv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -197,6 +210,7 @@
void __glXDispSwap_Indexfv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
@@ -204,6 +218,7 @@
void __glXDispSwap_Indexiv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 1);
@@ -211,6 +226,7 @@
void __glXDispSwap_Indexsv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 1);
@@ -223,6 +239,7 @@
void __glXDispSwap_Normal3dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -236,6 +253,7 @@
void __glXDispSwap_Normal3fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
@@ -243,6 +261,7 @@
void __glXDispSwap_Normal3iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -250,6 +269,7 @@
void __glXDispSwap_Normal3sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -257,6 +277,7 @@
void __glXDispSwap_RasterPos2dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -270,6 +291,7 @@
void __glXDispSwap_RasterPos2fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
@@ -277,6 +299,7 @@
void __glXDispSwap_RasterPos2iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 2);
@@ -284,6 +307,7 @@
void __glXDispSwap_RasterPos2sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
@@ -291,6 +315,7 @@
void __glXDispSwap_RasterPos3dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -304,6 +329,7 @@
void __glXDispSwap_RasterPos3fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
@@ -311,6 +337,7 @@
void __glXDispSwap_RasterPos3iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -318,6 +345,7 @@
void __glXDispSwap_RasterPos3sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -325,6 +353,7 @@
void __glXDispSwap_RasterPos4dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -338,6 +367,7 @@
void __glXDispSwap_RasterPos4fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
@@ -345,6 +375,7 @@
void __glXDispSwap_RasterPos4iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 4);
@@ -352,6 +383,7 @@
void __glXDispSwap_RasterPos4sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
@@ -359,6 +391,7 @@
void __glXDispSwap_Rectdv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -373,6 +406,7 @@
void __glXDispSwap_Rectfv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
@@ -381,6 +415,7 @@
void __glXDispSwap_Rectiv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 2);
@@ -389,6 +424,7 @@
void __glXDispSwap_Rectsv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
@@ -397,6 +433,7 @@
void __glXDispSwap_TexCoord1dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -410,6 +447,7 @@
void __glXDispSwap_TexCoord1fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
@@ -417,6 +455,7 @@
void __glXDispSwap_TexCoord1iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 1);
@@ -424,6 +463,7 @@
void __glXDispSwap_TexCoord1sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 1);
@@ -431,6 +471,7 @@
void __glXDispSwap_TexCoord2dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -444,6 +485,7 @@
void __glXDispSwap_TexCoord2fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
@@ -451,6 +493,7 @@
void __glXDispSwap_TexCoord2iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 2);
@@ -458,6 +501,7 @@
void __glXDispSwap_TexCoord2sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
@@ -465,6 +509,7 @@
void __glXDispSwap_TexCoord3dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -478,6 +523,7 @@
void __glXDispSwap_TexCoord3fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
@@ -485,6 +531,7 @@
void __glXDispSwap_TexCoord3iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -492,6 +539,7 @@
void __glXDispSwap_TexCoord3sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -499,6 +547,7 @@
void __glXDispSwap_TexCoord4dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -512,6 +561,7 @@
void __glXDispSwap_TexCoord4fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
@@ -519,6 +569,7 @@
void __glXDispSwap_TexCoord4iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 4);
@@ -526,6 +577,7 @@
void __glXDispSwap_TexCoord4sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
@@ -533,6 +585,7 @@
void __glXDispSwap_Vertex2dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -546,6 +599,7 @@
void __glXDispSwap_Vertex2fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
@@ -553,6 +607,7 @@
void __glXDispSwap_Vertex2iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 2);
@@ -560,6 +615,7 @@
void __glXDispSwap_Vertex2sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 2);
@@ -567,6 +623,7 @@
void __glXDispSwap_Vertex3dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -580,6 +637,7 @@
void __glXDispSwap_Vertex3fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 3);
@@ -587,6 +645,7 @@
void __glXDispSwap_Vertex3iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 3);
@@ -594,6 +653,7 @@
void __glXDispSwap_Vertex3sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 3);
@@ -601,6 +661,7 @@
void __glXDispSwap_Vertex4dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -614,6 +675,7 @@
void __glXDispSwap_Vertex4fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 4);
@@ -621,6 +683,7 @@
void __glXDispSwap_Vertex4iv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY(pc + 0, 4);
@@ -628,6 +691,7 @@
void __glXDispSwap_Vertex4sv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT_ARRAY(pc + 0, 4);
@@ -635,6 +699,7 @@
void __glXDispSwap_ClipPlane(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -674,6 +739,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -695,6 +761,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -732,6 +799,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -755,6 +823,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -777,6 +846,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -798,6 +868,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -835,6 +906,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -858,6 +930,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -913,6 +986,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -936,6 +1010,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -959,6 +1034,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -982,6 +1058,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1012,6 +1089,7 @@
GLenum pname;
GLint cmdlen;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1043,6 +1121,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1066,6 +1145,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1282,6 +1362,7 @@
void __glXDispSwap_EvalCoord1dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -1295,6 +1376,7 @@
void __glXDispSwap_EvalCoord1fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 1);
@@ -1302,6 +1384,7 @@
void __glXDispSwap_EvalCoord2dv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -1315,6 +1398,7 @@
void __glXDispSwap_EvalCoord2fv(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 2);
@@ -1430,6 +1514,7 @@
void __glXDispSwap_PixelMapfv(GLbyte *pc)
{
GLint mapsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1441,6 +1526,7 @@
void __glXDispSwap_PixelMapuiv(GLbyte *pc)
{
GLint mapsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1452,6 +1538,7 @@
void __glXDispSwap_PixelMapusv(GLbyte *pc)
{
GLint mapsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1517,6 +1604,7 @@
void __glXDispSwap_LoadMatrixf(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 16);
@@ -1524,6 +1612,7 @@
void __glXDispSwap_LoadMatrixd(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -1544,6 +1633,7 @@
void __glXDispSwap_MultMatrixf(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_FLOAT_ARRAY(pc + 0, 16);
@@ -1551,6 +1641,7 @@
void __glXDispSwap_MultMatrixd(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -1746,6 +1837,7 @@
void __glXDispSwap_PrioritizeTextures(GLbyte *pc)
{
GLsizei n;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -1780,6 +1872,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1794,6 +1887,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1839,6 +1933,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1862,6 +1957,7 @@
{
GLenum pname;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
@@ -1950,6 +2046,7 @@
void __glXDispSwap_MultiTexCoord1dvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -1964,6 +2061,7 @@
void __glXDispSwap_MultiTexCoord1fvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -1972,6 +2070,7 @@
void __glXDispSwap_MultiTexCoord1ivARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -1980,6 +2079,7 @@
void __glXDispSwap_MultiTexCoord1svARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -1988,6 +2088,7 @@
void __glXDispSwap_MultiTexCoord2dvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -2002,6 +2103,7 @@
void __glXDispSwap_MultiTexCoord2fvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -2010,6 +2112,7 @@
void __glXDispSwap_MultiTexCoord2ivARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -2018,6 +2121,7 @@
void __glXDispSwap_MultiTexCoord2svARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -2026,6 +2130,7 @@
void __glXDispSwap_MultiTexCoord3dvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -2040,6 +2145,7 @@
void __glXDispSwap_MultiTexCoord3fvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -2048,6 +2154,7 @@
void __glXDispSwap_MultiTexCoord3ivARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -2056,6 +2163,7 @@
void __glXDispSwap_MultiTexCoord3svARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -2064,6 +2172,7 @@
void __glXDispSwap_MultiTexCoord4dvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
#ifdef __GLX_ALIGN64
@@ -2078,6 +2187,7 @@
void __glXDispSwap_MultiTexCoord4fvARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -2086,6 +2196,7 @@
void __glXDispSwap_MultiTexCoord4ivARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -2094,6 +2205,7 @@
void __glXDispSwap_MultiTexCoord4svARB(GLbyte *pc)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
Index: programs/Xserver/hw/dmx/glxProxy/glxcmds.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/dmx/glxProxy/glxcmds.c,v
retrieving revision 1.3
diff -u -r1.3 glxcmds.c
--- programs/Xserver/hw/dmx/glxProxy/glxcmds.c 4 Aug 2004 16:33:34 -0000
1.3
+++ programs/Xserver/hw/dmx/glxProxy/glxcmds.c 12 Jan 2005 00:13:53 -0000
@@ -1604,12 +1604,14 @@
buf[p++] = pGlxVisual->transparentAlpha;
buf[p++] = GLX_TRANSPARENT_INDEX_VALUE_EXT;
buf[p++] = pGlxVisual->transparentIndex;
+#if 0
buf[p++] = GLX_SAMPLES_SGIS;
buf[p++] = pGlxVisual->multiSampleSize;
buf[p++] = GLX_SAMPLE_BUFFERS_SGIS;
buf[p++] = pGlxVisual->nMultiSampleBuffers;
buf[p++] = GLX_VISUAL_SELECT_GROUP_SGIX;
buf[p++] = pGlxVisual->visualSelectGroup;
+#endif
WriteToClient(client, __GLX_SIZE_CARD32 * __GLX_TOTAL_CONFIG,
(char *)buf);
@@ -2854,6 +2856,7 @@
buf[p++] = pFBConfig->visualSelectGroup;
if (client->swapped) {
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT_ARRAY((int *)buf, 2*numAttribs);
}
Index: programs/Xserver/hw/dmx/glxProxy/glxcmdsswap.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/dmx/glxProxy/glxcmdsswap.c,v
retrieving revision 1.2
diff -u -r1.2 glxcmdsswap.c
--- programs/Xserver/hw/dmx/glxProxy/glxcmdsswap.c 4 Aug 2004 16:33:34
-0000 1.2
+++ programs/Xserver/hw/dmx/glxProxy/glxcmdsswap.c 12 Jan 2005 00:13:53
-0000
@@ -256,6 +256,7 @@
CARD32 buf[__GLX_TOTAL_CONFIG];
unsigned int screen;
int i, p;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(&req->screen);
@@ -489,6 +490,7 @@
xGLXQueryExtensionsStringReply *reply,
char *buf)
{
int length = reply->length;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&reply->sequenceNumber);
__GLX_SWAP_INT(&reply->length);
@@ -515,6 +517,7 @@
void __glXSwapQueryContextInfoEXTReply(ClientPtr client,
xGLXQueryContextInfoEXTReply *reply, int *buf)
{
int length = reply->length;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&reply->sequenceNumber);
__GLX_SWAP_INT(&reply->length);
@@ -529,6 +532,7 @@
xGLXQueryContextReply *reply, int *buf)
{
int length = reply->length;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&reply->sequenceNumber);
__GLX_SWAP_INT(&reply->length);
@@ -541,6 +545,7 @@
void __glXSwapGetDrawableAttributesReply(ClientPtr client,
xGLXGetDrawableAttributesReply *reply, int
*buf)
{
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&reply->sequenceNumber);
__GLX_SWAP_INT(&reply->length);
@@ -614,6 +619,7 @@
proc = info->swapfunc;
}
else {
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
proc = NULL;
if (info->elem_size == 4 && info->nelems > 0) {
@@ -656,6 +662,7 @@
ClientPtr client = cl->client;
xGLXRenderLargeReq *req;
__GLXrenderLargeHeader *hdr;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
req = (xGLXRenderLargeReq *) pc;
@@ -1009,6 +1016,7 @@
{
xGLXCreatePbufferReq *req = (xGLXCreatePbufferReq *)pc;
int nattr = req->numAttribs;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
@@ -1046,6 +1054,7 @@
int __glXSwapChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
{
xGLXChangeDrawableAttributesReq *req = (xGLXChangeDrawableAttributesReq
*)pc;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
Index: programs/Xserver/hw/dmx/glxProxy/glxsingle.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/dmx/glxProxy/glxsingle.c,v
retrieving revision 1.2
diff -u -r1.2 glxsingle.c
--- programs/Xserver/hw/dmx/glxProxy/glxsingle.c 4 Aug 2004 16:33:34
-0000 1.2
+++ programs/Xserver/hw/dmx/glxProxy/glxsingle.c 12 Jan 2005 00:13:53
-0000
@@ -391,6 +391,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);
@@ -414,6 +415,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);
@@ -437,6 +439,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);
@@ -461,6 +464,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);
@@ -485,6 +489,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);
@@ -509,6 +514,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);
@@ -533,6 +539,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);
@@ -557,6 +564,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);
@@ -581,6 +589,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);
Index: programs/Xserver/hw/dmx/glxProxy/glxvendor.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/dmx/glxProxy/glxvendor.c,v
retrieving revision 1.2
diff -u -r1.2 glxvendor.c
--- programs/Xserver/hw/dmx/glxProxy/glxvendor.c 4 Aug 2004 16:33:34
-0000 1.2
+++ programs/Xserver/hw/dmx/glxProxy/glxvendor.c 12 Jan 2005 00:13:53
-0000
@@ -386,6 +386,7 @@
int __glXVForwardPipe0WithReplySwap( __GLXclientState *cl, GLbyte *pc )
{
xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
@@ -410,6 +411,7 @@
int __glXVForwardPipe0WithReplySwapsv( __GLXclientState *cl, GLbyte *pc )
{
xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
@@ -434,6 +436,7 @@
int __glXVForwardPipe0WithReplySwapiv( __GLXclientState *cl, GLbyte *pc )
{
xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
@@ -458,6 +461,7 @@
int __glXVForwardPipe0WithReplySwapdv( __GLXclientState *cl, GLbyte *pc )
{
xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
@@ -482,6 +486,7 @@
int __glXVForwardAllWithReplySwap( __GLXclientState *cl, GLbyte *pc )
{
xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
@@ -506,6 +511,7 @@
int __glXVForwardAllWithReplySwapsv( __GLXclientState *cl, GLbyte *pc )
{
xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
@@ -530,6 +536,7 @@
int __glXVForwardAllWithReplySwapiv( __GLXclientState *cl, GLbyte *pc )
{
xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
@@ -554,6 +561,7 @@
int __glXVForwardAllWithReplySwapdv( __GLXclientState *cl, GLbyte *pc )
{
xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *)pc;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
Index: programs/Xserver/hw/dmx/glxProxy/glxvisuals.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/dmx/glxProxy/glxvisuals.c,v
retrieving revision 1.1
diff -u -r1.1 glxvisuals.c
--- programs/Xserver/hw/dmx/glxProxy/glxvisuals.c 30 Jun 2004 20:21:44
-0000 1.1
+++ programs/Xserver/hw/dmx/glxProxy/glxvisuals.c 12 Jan 2005 00:13:53
-0000
@@ -71,10 +71,13 @@
(v1->transparentGreen == v2->transparentGreen) &&
(v1->transparentBlue == v2->transparentBlue) &&
(v1->transparentAlpha == v2->transparentAlpha) &&
- (v1->transparentIndex == v2->transparentIndex) &&
- (v1->multiSampleSize == v2->multiSampleSize) &&
+ (v1->transparentIndex == v2->transparentIndex)
+#if 0
+ && (v1->multiSampleSize == v2->multiSampleSize) &&
(v1->nMultiSampleBuffers == v2->nMultiSampleBuffers) &&
- (v1->visualSelectGroup == v2->visualSelectGroup) ) {
+ (v1->visualSelectGroup == v2->visualSelectGroup)
+#endif
+ ) {
return(1);
Index: programs/Xserver/hw/dmx/glxProxy/render2swap.c
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/dmx/glxProxy/render2swap.c,v
retrieving revision 1.2
diff -u -r1.2 render2swap.c
--- programs/Xserver/hw/dmx/glxProxy/render2swap.c 4 Aug 2004 16:33:34
-0000 1.2
+++ programs/Xserver/hw/dmx/glxProxy/render2swap.c 12 Jan 2005 00:13:53
-0000
@@ -75,6 +75,7 @@
GLfloat u1, u2, *points;
GLenum target;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -104,6 +105,7 @@
GLfloat u1, u2, v1, v2, *points;
GLenum target;
GLint compsize;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
@@ -141,6 +143,7 @@
GLint order, k, compsize;
GLenum target;
GLdouble u1, u2, *points;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_DOUBLE(pc + 0);
@@ -183,6 +186,7 @@
GLdouble u1, u2, v1, v2, *points;
GLint uorder, vorder, ustride, vstride, k, compsize;
GLenum target;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_DOUBLE(pc + 0);
@@ -232,6 +236,7 @@
{
GLenum type;
GLsizei n;
+ __GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 4);
