Attachment 1532 Details for Bug 2070 – Workaround to restore backwards compatibility

[patch] Workaround to restore backwards compatibility

glxproxy-compat.patch (text/plain), 4.07 KB, created by Kevin E. Martin on 2004-12-12 18:48:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin E. Martin

Created: 2004-12-12 18:48:41 UTC

Size: 4.07 KB

patch

obsolete

>Index: include/GL/glxint.h
>===================================================================
>RCS file: /cvs/xorg/xc/include/GL/glxint.h,v
>retrieving revision 1.3
>diff -u -r1.3 glxint.h
>--- include/GL/glxint.h	30 Jun 2004 20:06:52 -0000	1.3
>+++ include/GL/glxint.h	13 Dec 2004 02:28:07 -0000
>@@ -50,15 +50,21 @@
> 				/*    colors are floats scaled to ints */
>     int transparentRed, transparentGreen, transparentBlue, transparentAlpha;
>     int transparentIndex;
>+#ifdef __sgi
>     int multiSampleSize;
>     int nMultiSampleBuffers;
>     int visualSelectGroup;
>+#endif
> };
> 
> #define __GLX_MIN_CONFIG_PROPS	18
> #define __GLX_MAX_CONFIG_PROPS	500
> 
>+#ifdef __sgi
> #define __GLX_EXT_CONFIG_PROPS 	10
>+#else
>+#define __GLX_EXT_CONFIG_PROPS 	7
>+#endif
> 
> /*
> ** Since we send all non-core visual properties as token, value pairs,
>Index: programs/Xserver/hw/dmx/dmx_glxvisuals.c
>===================================================================
>RCS file: /cvs/xorg/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:06:53 -0000	1.1
>+++ programs/Xserver/hw/dmx/dmx_glxvisuals.c	13 Dec 2004 02:28:08 -0000
>@@ -147,12 +147,14 @@
> 	    int value = *p++;
> 
> 	    switch (property) {
>+#ifdef __sgi
> 	      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;
> 
>+#ifdef __sgi
> 	      /* 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;
>+#ifdef __sgi
> 	  cfg->multiSampleSize = fbcfg->multiSampleSize;
> 	  cfg->nMultiSampleBuffers = fbcfg->nMultiSampleBuffers;
> 	  cfg->visualSelectGroup = fbcfg->visualSelectGroup;
>+#endif
>        }
>     }
> 
>Index: programs/Xserver/hw/dmx/glxProxy/glxcmds.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/dmx/glxProxy/glxcmds.c,v
>retrieving revision 1.2
>diff -u -r1.2 glxcmds.c
>--- programs/Xserver/hw/dmx/glxProxy/glxcmds.c	6 Jul 2004 23:51:00 -0000	1.2
>+++ programs/Xserver/hw/dmx/glxProxy/glxcmds.c	13 Dec 2004 02:28:08 -0000
>@@ -1607,12 +1607,14 @@
> 	buf[p++] = pGlxVisual->transparentAlpha;
> 	buf[p++] = GLX_TRANSPARENT_INDEX_VALUE_EXT;
> 	buf[p++] = pGlxVisual->transparentIndex;
>+#ifdef __sgi
> 	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);
>Index: programs/Xserver/hw/dmx/glxProxy/glxvisuals.c
>===================================================================
>RCS file: /cvs/xorg/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:06:55 -0000	1.1
>+++ programs/Xserver/hw/dmx/glxProxy/glxvisuals.c	13 Dec 2004 02:28:09 -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)
>+#ifdef __sgi
>+	   && (v1->multiSampleSize == v2->multiSampleSize) &&
> 	   (v1->nMultiSampleBuffers == v2->nMultiSampleBuffers) &&
>-	   (v1->visualSelectGroup == v2->visualSelectGroup)         ) {
>+	   (v1->visualSelectGroup == v2->visualSelectGroup)
>+#endif
>+	  ) {
> 
> 	      return(1);
>

Flags:

roland.mainz: 6.8-branch-

Actions: View | Splinter Review

Attachments on bug 2070: 1532

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.