libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011

4 files changed, 674 insertions, 684 deletions

diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index f79264ea9..a76201da0 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -59,9 +59,6 @@
 extern __GLXFBConfig **__glXFBConfigs;
 extern int            __glXNumFBConfigs;
 
-extern __GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id );
-extern __GLXFBConfig *glxLookupFBConfigByVID( VisualID vid );
-extern __GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen );
 extern int glxIsExtensionSupported( char *ext );
 extern int __glXGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
 
@@ -70,6 +67,44 @@ extern int __glXGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
              (x) - dmxScreen->glxErrorBase + __glXerrorBase \
 	     : (x) )
 
+static __GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id )
+{
+   int i,j;
+
+   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
+      if ( __glXFBConfigs[j]->id == id)
+	 return __glXFBConfigs[j];
+   }
+
+   return NULL;
+}
+
+static __GLXFBConfig *glxLookupFBConfigByVID( VisualID vid )
+{
+   int i,j;
+
+   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
+      if ( __glXFBConfigs[j]->associatedVisualId == vid)
+	 return __glXFBConfigs[j];
+   }
+
+   return NULL;
+}
+
+static __GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen )
+{
+   int i;
+   int j;
+
+   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
+      if ( __glXFBConfigs[j]->id == id)
+	 return __glXFBConfigs[j+screen+1];
+   }
+
+   return NULL;
+
+}
+
 Display *GetBackEndDisplay( __GLXclientState *cl, int s )
 {
    if (! cl->be_displays[s] ) {
diff --git a/xorg-server/hw/dmx/glxProxy/glxscreens.c b/xorg-server/hw/dmx/glxProxy/glxscreens.c
index df49fe50d..01e041c8f 100644
--- a/xorg-server/hw/dmx/glxProxy/glxscreens.c
+++ b/xorg-server/hw/dmx/glxProxy/glxscreens.c
@@ -1,371 +1,332 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

- * shall be included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxlog.h"

-

-#include "glxserver.h"

-

-#include <windowstr.h>

-

-#include "glxfbconfig.h"

-

-#ifdef PANORAMIX

-#include "panoramiXsrv.h"

-#endif

-

-__GLXscreenInfo *__glXActiveScreens;

-GLint __glXNumActiveScreens;

-

-__GLXFBConfig **__glXFBConfigs;

-int            __glXNumFBConfigs;

-

-static char GLXServerVendorName[] = "SGI DMX/glxProxy";

-static char GLXServerVersion[64];

-static char GLXServerExtensions[] =

-            "GLX_EXT_visual_info "

-            "GLX_EXT_visual_rating "

-            "GLX_EXT_import_context "

-	    "GLX_SGIX_fbconfig "

-	    "GLX_SGI_make_current_read "

-	    "GLX_SGI_swap_control "

-            ;

-

-static char ExtensionsString[1024];

-

-static void CalcServerVersionAndExtensions( void )

-{

-   int s;

-   xGLXQueryVersionReq *req;

-   xGLXQueryVersionReply reply;

-   char **be_extensions;

-   char *ext;

-   char *denied_extensions;

-

-   /*

-    * set the server glx version to be the minimum version

-    * supported by all back-end servers

-    */

-   __glXVersionMajor = 0;

-   __glXVersionMinor = 0;

-   for (s=0; s<__glXNumActiveScreens; s++) {

-      DMXScreenInfo *dmxScreen = &dmxScreens[s];

-      Display *dpy = dmxScreen->beDisplay;

-

-      /* Send the glXQueryVersion request */

-      LockDisplay(dpy);

-      GetReq(GLXQueryVersion,req);

-      req->reqType = dmxScreen->glxMajorOpcode;

-      req->glxCode = X_GLXQueryVersion;

-      req->majorVersion = GLX_SERVER_MAJOR_VERSION;

-      req->minorVersion = GLX_SERVER_MINOR_VERSION;

-      _XReply(dpy, (xReply*) &reply, 0, False);

-      UnlockDisplay(dpy);

-      SyncHandle();

-

-      if (s == 0) {

-	 __glXVersionMajor = reply.majorVersion;

-	 __glXVersionMinor = reply.minorVersion;

-      }

-      else {

-	 if (reply.majorVersion < __glXVersionMajor) {

-	    __glXVersionMajor = reply.majorVersion;

-	    __glXVersionMinor = reply.minorVersion;

-	 }

-	 else if ( (reply.majorVersion == __glXVersionMajor) &&

-	           (reply.minorVersion < __glXVersionMinor)  ) {

-	    __glXVersionMinor = reply.minorVersion;

-	 }

-      }

-

-   }

-

-   if (GLX_SERVER_MAJOR_VERSION < __glXVersionMajor) {

-      __glXVersionMajor = GLX_SERVER_MAJOR_VERSION;

-      __glXVersionMinor = GLX_SERVER_MINOR_VERSION;

-   }

-   else if ( (GLX_SERVER_MAJOR_VERSION == __glXVersionMajor) &&

-	     (GLX_SERVER_MINOR_VERSION < __glXVersionMinor)  ) {

-      __glXVersionMinor = GLX_SERVER_MINOR_VERSION;

-   }

-

-   sprintf(GLXServerVersion, "%d.%d DMX %d back-end server(s)",

-              __glXVersionMajor, __glXVersionMinor, __glXNumActiveScreens );	 

-   /*

-    * set the ExtensionsString to the minimum extensions string

-    */

-   ExtensionsString[0] = '\0';

-

-   /*

-    * read extensions strings of all back-end servers

-    */

-   be_extensions = (char **)malloc( __glXNumActiveScreens * sizeof(char *) );

-   if (!be_extensions)

-      return;

-

-   for (s=0; s<__glXNumActiveScreens; s++) {

-      DMXScreenInfo *dmxScreen = &dmxScreens[s];

-      Display *dpy = dmxScreen->beDisplay;

-      xGLXQueryServerStringReq *req;

-      xGLXQueryServerStringReply reply;

-      int length, numbytes, slop;

-

-      /* Send the glXQueryServerString request */

-      LockDisplay(dpy);

-      GetReq(GLXQueryServerString,req);

-      req->reqType = dmxScreen->glxMajorOpcode;

-      req->glxCode = X_GLXQueryServerString;

-      req->screen = DefaultScreen(dpy);

-      req->name = GLX_EXTENSIONS;

-      _XReply(dpy, (xReply*) &reply, 0, False);

-

-      length = (int)reply.length;

-      numbytes = (int)reply.n;

-      slop = numbytes * __GLX_SIZE_INT8 & 3;

-      be_extensions[s] = (char *)malloc(numbytes);

-      if (!be_extensions[s]) {

-	 /* Throw data on the floor */

-	 _XEatData(dpy, length);

-      } else {

-	 _XRead(dpy, (char *)be_extensions[s], numbytes);

-	 if (slop) _XEatData(dpy,4-slop);

-      }

-      UnlockDisplay(dpy);

-      SyncHandle();

-   }

-

-   /*

-    * extensions string will include only extensions that our

-    * server supports as well as all back-end servers supports.

-    * extensions that are in the DMX_DENY_EXTENSIONS string will

-    * not be supported.

-    */

-   denied_extensions = getenv("DMX_DENY_GLX_EXTENSIONS");

-   ext = strtok(GLXServerExtensions, " ");

-   while( ext ) {

-      int supported = 1;

-

-      if (denied_extensions && strstr(denied_extensions, ext)) {

-	 supported = 0;

-      }

-      else {

-	 for (s=0; s<__glXNumActiveScreens && supported; s++) {

-	    if ( !strstr(be_extensions[s], ext) ) {

-	       supported = 0;

-	    }

-	 }

-      }

-

-      if (supported) {

-	 strcat(ExtensionsString, ext);

-	 strcat(ExtensionsString, " ");

-      }

-

-      ext = strtok(NULL, " ");

-   }

-

-   /*

-    * release temporary storage

-    */

-   for (s=0; s<__glXNumActiveScreens; s++) {

-      free(be_extensions[s]);

-   }

-   free( be_extensions );

-

-   if (dmxGLXSwapGroupSupport) {

-       if (!denied_extensions ||

-	   !strstr(denied_extensions, "GLX_SGIX_swap_group")) {

-	   strcat(ExtensionsString, "GLX_SGIX_swap_group");

-	   if (!denied_extensions ||

-	       !strstr(denied_extensions, "GLX_SGIX_swap_barrier")) {

-	       strcat(ExtensionsString, " GLX_SGIX_swap_barrier");

-	   }

-       }

-   }

-

-}

-

-void __glXScreenInit(GLint numscreens)

-{

-   int s;

-   int c;

-   DMXScreenInfo *dmxScreen0 = &dmxScreens[0];

-    __glXNumActiveScreens = numscreens;

-

-

-   CalcServerVersionAndExtensions();

-

-

-   __glXFBConfigs = NULL;

-   __glXNumFBConfigs = 0;

-

-   if ( (__glXVersionMajor == 1 && __glXVersionMinor >= 3) ||

-        (__glXVersionMajor > 1) ||

-	( strstr(ExtensionsString, "GLX_SGIX_fbconfig") )      ) {

-

-      /*

-      // Initialize FBConfig info.

-      // find the set of FBConfigs that are present on all back-end

-      // servers - only those configs will be supported

-       */

-      __glXFBConfigs = (__GLXFBConfig **)malloc( dmxScreen0->numFBConfigs *

-	                      (numscreens+1) * sizeof(__GLXFBConfig *) );

-      __glXNumFBConfigs = 0;

-   

-      for (c=0; c<dmxScreen0->numFBConfigs; c++) { 

-	 __GLXFBConfig *cfg = NULL;

-

-	 if (numscreens > 1) {

-	    for (s=1; s<numscreens; s++) {

-	       DMXScreenInfo *dmxScreen = &dmxScreens[s];

-	  

-	       cfg = FindMatchingFBConfig( &dmxScreen0->fbconfigs[c],

-		                           dmxScreen->fbconfigs, 

-		                           dmxScreen->numFBConfigs );

-	       __glXFBConfigs[ __glXNumFBConfigs * (numscreens+1) + s + 1 ] = cfg;

-	       if (!cfg) {

-		  dmxLog(dmxInfo,"screen0 FBConfig 0x%x is missing on screen#%d\n", dmxScreen0->fbconfigs[c].id, s);

-		  break;

-	       }

-	       else {

-		  dmxLog(dmxInfo,"screen0 FBConfig 0x%x matched to  0x%x on screen#%d\n", dmxScreen0->fbconfigs[c].id, cfg->id, s);

-	       }

-	    }

-         }

-	 else {

-	    cfg = &dmxScreen0->fbconfigs[c];

-	 }

-

-	 if (cfg) {

-

-	    /* filter out overlay visuals */

-	    if (cfg->level == 0) {

-	       __GLXFBConfig *proxy_cfg;

-

-	       __glXFBConfigs[ __glXNumFBConfigs * (numscreens+1) + 1 ] = 

-	               &dmxScreen0->fbconfigs[c];

-

-	       proxy_cfg = malloc( sizeof(__GLXFBConfig) );

-	       memcpy( proxy_cfg, cfg, sizeof(__GLXFBConfig) );

-	       proxy_cfg->id =  FakeClientID(0);

-	       /* visual will be associated later in __glXGetFBConfigs */

-	       proxy_cfg->associatedVisualId =  (unsigned int)-1;

-

-	       __glXFBConfigs[ __glXNumFBConfigs * (numscreens+1) + 0 ] = proxy_cfg;

-

-	       __glXNumFBConfigs++;

-	    }

-

-	 }

-

-      }

-

-    }

-

-}

-

-void __glXScreenReset(void)

-{

-  __glXNumActiveScreens = 0;

-}

-

-char *__glXGetServerString( unsigned int name ) 

-{

-   char *ret = NULL;

-

-   switch( name) {

-

-      case GLX_VENDOR:

-	 ret = GLXServerVendorName;

-	 break;

-

-      case GLX_VERSION:

-	 ret = GLXServerVersion;

-	 break;

-

-      case GLX_EXTENSIONS:

-	 ret = ExtensionsString;

-	 break;

-

-      default:

-	 break;

-   }

-

-   return ret;

-

-}

-

-

-__GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id )

-{

-   int i,j;

-

-   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {

-      if ( __glXFBConfigs[j]->id == id) 

-	 return __glXFBConfigs[j];

-   }

-

-   return NULL;

-}

-

-__GLXFBConfig *glxLookupFBConfigByVID( VisualID vid )

-{

-   int i,j;

-

-   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {

-      if ( __glXFBConfigs[j]->associatedVisualId == vid) 

-	 return __glXFBConfigs[j];

-   }

-

-   return NULL;

-}

-

-__GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen )

-{

-   int i;

-   int j;

-

-   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {

-      if ( __glXFBConfigs[j]->id == id) 

-	 return __glXFBConfigs[j+screen+1];

-   }

-

-   return NULL;

-

-}

-

-int glxIsExtensionSupported( char *ext )

-{

-   return( strstr(ExtensionsString, ext) != NULL );

-}

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxlog.h"
+
+#include "glxserver.h"
+
+#include <windowstr.h>
+
+#include "glxfbconfig.h"
+
+#ifdef PANORAMIX
+#include "panoramiXsrv.h"
+#endif
+
+__GLXscreenInfo *__glXActiveScreens;
+GLint __glXNumActiveScreens;
+
+__GLXFBConfig **__glXFBConfigs;
+int            __glXNumFBConfigs;
+
+static char GLXServerVendorName[] = "SGI DMX/glxProxy";
+static char GLXServerVersion[64];
+static char GLXServerExtensions[] =
+            "GLX_EXT_visual_info "
+            "GLX_EXT_visual_rating "
+            "GLX_EXT_import_context "
+	    "GLX_SGIX_fbconfig "
+	    "GLX_SGI_make_current_read "
+	    "GLX_SGI_swap_control "
+            ;
+
+static char ExtensionsString[1024];
+
+static void CalcServerVersionAndExtensions( void )
+{
+   int s;
+   xGLXQueryVersionReq *req;
+   xGLXQueryVersionReply reply;
+   char **be_extensions;
+   char *ext;
+   char *denied_extensions;
+
+   /*
+    * set the server glx version to be the minimum version
+    * supported by all back-end servers
+    */
+   __glXVersionMajor = 0;
+   __glXVersionMinor = 0;
+   for (s=0; s<__glXNumActiveScreens; s++) {
+      DMXScreenInfo *dmxScreen = &dmxScreens[s];
+      Display *dpy = dmxScreen->beDisplay;
+
+      /* Send the glXQueryVersion request */
+      LockDisplay(dpy);
+      GetReq(GLXQueryVersion,req);
+      req->reqType = dmxScreen->glxMajorOpcode;
+      req->glxCode = X_GLXQueryVersion;
+      req->majorVersion = GLX_SERVER_MAJOR_VERSION;
+      req->minorVersion = GLX_SERVER_MINOR_VERSION;
+      _XReply(dpy, (xReply*) &reply, 0, False);
+      UnlockDisplay(dpy);
+      SyncHandle();
+
+      if (s == 0) {
+	 __glXVersionMajor = reply.majorVersion;
+	 __glXVersionMinor = reply.minorVersion;
+      }
+      else {
+	 if (reply.majorVersion < __glXVersionMajor) {
+	    __glXVersionMajor = reply.majorVersion;
+	    __glXVersionMinor = reply.minorVersion;
+	 }
+	 else if ( (reply.majorVersion == __glXVersionMajor) &&
+	           (reply.minorVersion < __glXVersionMinor)  ) {
+	    __glXVersionMinor = reply.minorVersion;
+	 }
+      }
+
+   }
+
+   if (GLX_SERVER_MAJOR_VERSION < __glXVersionMajor) {
+      __glXVersionMajor = GLX_SERVER_MAJOR_VERSION;
+      __glXVersionMinor = GLX_SERVER_MINOR_VERSION;
+   }
+   else if ( (GLX_SERVER_MAJOR_VERSION == __glXVersionMajor) &&
+	     (GLX_SERVER_MINOR_VERSION < __glXVersionMinor)  ) {
+      __glXVersionMinor = GLX_SERVER_MINOR_VERSION;
+   }
+
+   sprintf(GLXServerVersion, "%d.%d DMX %d back-end server(s)",
+              __glXVersionMajor, __glXVersionMinor, __glXNumActiveScreens );	 
+   /*
+    * set the ExtensionsString to the minimum extensions string
+    */
+   ExtensionsString[0] = '\0';
+
+   /*
+    * read extensions strings of all back-end servers
+    */
+   be_extensions = (char **)malloc( __glXNumActiveScreens * sizeof(char *) );
+   if (!be_extensions)
+      return;
+
+   for (s=0; s<__glXNumActiveScreens; s++) {
+      DMXScreenInfo *dmxScreen = &dmxScreens[s];
+      Display *dpy = dmxScreen->beDisplay;
+      xGLXQueryServerStringReq *req;
+      xGLXQueryServerStringReply reply;
+      int length, numbytes, slop;
+
+      /* Send the glXQueryServerString request */
+      LockDisplay(dpy);
+      GetReq(GLXQueryServerString,req);
+      req->reqType = dmxScreen->glxMajorOpcode;
+      req->glxCode = X_GLXQueryServerString;
+      req->screen = DefaultScreen(dpy);
+      req->name = GLX_EXTENSIONS;
+      _XReply(dpy, (xReply*) &reply, 0, False);
+
+      length = (int)reply.length;
+      numbytes = (int)reply.n;
+      slop = numbytes * __GLX_SIZE_INT8 & 3;
+      be_extensions[s] = (char *)malloc(numbytes);
+      if (!be_extensions[s]) {
+	 /* Throw data on the floor */
+	 _XEatData(dpy, length);
+      } else {
+	 _XRead(dpy, (char *)be_extensions[s], numbytes);
+	 if (slop) _XEatData(dpy,4-slop);
+      }
+      UnlockDisplay(dpy);
+      SyncHandle();
+   }
+
+   /*
+    * extensions string will include only extensions that our
+    * server supports as well as all back-end servers supports.
+    * extensions that are in the DMX_DENY_EXTENSIONS string will
+    * not be supported.
+    */
+   denied_extensions = getenv("DMX_DENY_GLX_EXTENSIONS");
+   ext = strtok(GLXServerExtensions, " ");
+   while( ext ) {
+      int supported = 1;
+
+      if (denied_extensions && strstr(denied_extensions, ext)) {
+	 supported = 0;
+      }
+      else {
+	 for (s=0; s<__glXNumActiveScreens && supported; s++) {
+	    if ( !strstr(be_extensions[s], ext) ) {
+	       supported = 0;
+	    }
+	 }
+      }
+
+      if (supported) {
+	 strcat(ExtensionsString, ext);
+	 strcat(ExtensionsString, " ");
+      }
+
+      ext = strtok(NULL, " ");
+   }
+
+   /*
+    * release temporary storage
+    */
+   for (s=0; s<__glXNumActiveScreens; s++) {
+      free(be_extensions[s]);
+   }
+   free( be_extensions );
+
+   if (dmxGLXSwapGroupSupport) {
+       if (!denied_extensions ||
+	   !strstr(denied_extensions, "GLX_SGIX_swap_group")) {
+	   strcat(ExtensionsString, "GLX_SGIX_swap_group");
+	   if (!denied_extensions ||
+	       !strstr(denied_extensions, "GLX_SGIX_swap_barrier")) {
+	       strcat(ExtensionsString, " GLX_SGIX_swap_barrier");
+	   }
+       }
+   }
+
+}
+
+void __glXScreenInit(GLint numscreens)
+{
+   int s;
+   int c;
+   DMXScreenInfo *dmxScreen0 = &dmxScreens[0];
+    __glXNumActiveScreens = numscreens;
+
+
+   CalcServerVersionAndExtensions();
+
+
+   __glXFBConfigs = NULL;
+   __glXNumFBConfigs = 0;
+
+   if ( (__glXVersionMajor == 1 && __glXVersionMinor >= 3) ||
+        (__glXVersionMajor > 1) ||
+	( strstr(ExtensionsString, "GLX_SGIX_fbconfig") )      ) {
+
+      /*
+      // Initialize FBConfig info.
+      // find the set of FBConfigs that are present on all back-end
+      // servers - only those configs will be supported
+       */
+      __glXFBConfigs = (__GLXFBConfig **)malloc( dmxScreen0->numFBConfigs *
+	                      (numscreens+1) * sizeof(__GLXFBConfig *) );
+      __glXNumFBConfigs = 0;
+   
+      for (c=0; c<dmxScreen0->numFBConfigs; c++) { 
+	 __GLXFBConfig *cfg = NULL;
+
+	 if (numscreens > 1) {
+	    for (s=1; s<numscreens; s++) {
+	       DMXScreenInfo *dmxScreen = &dmxScreens[s];
+	  
+	       cfg = FindMatchingFBConfig( &dmxScreen0->fbconfigs[c],
+		                           dmxScreen->fbconfigs, 
+		                           dmxScreen->numFBConfigs );
+	       __glXFBConfigs[ __glXNumFBConfigs * (numscreens+1) + s + 1 ] = cfg;
+	       if (!cfg) {
+		  dmxLog(dmxInfo,"screen0 FBConfig 0x%x is missing on screen#%d\n", dmxScreen0->fbconfigs[c].id, s);
+		  break;
+	       }
+	       else {
+		  dmxLog(dmxInfo,"screen0 FBConfig 0x%x matched to  0x%x on screen#%d\n", dmxScreen0->fbconfigs[c].id, cfg->id, s);
+	       }
+	    }
+         }
+	 else {
+	    cfg = &dmxScreen0->fbconfigs[c];
+	 }
+
+	 if (cfg) {
+
+	    /* filter out overlay visuals */
+	    if (cfg->level == 0) {
+	       __GLXFBConfig *proxy_cfg;
+
+	       __glXFBConfigs[ __glXNumFBConfigs * (numscreens+1) + 1 ] = 
+	               &dmxScreen0->fbconfigs[c];
+
+	       proxy_cfg = malloc( sizeof(__GLXFBConfig) );
+	       memcpy( proxy_cfg, cfg, sizeof(__GLXFBConfig) );
+	       proxy_cfg->id =  FakeClientID(0);
+	       /* visual will be associated later in __glXGetFBConfigs */
+	       proxy_cfg->associatedVisualId =  (unsigned int)-1;
+
+	       __glXFBConfigs[ __glXNumFBConfigs * (numscreens+1) + 0 ] = proxy_cfg;
+
+	       __glXNumFBConfigs++;
+	    }
+
+	 }
+
+      }
+
+    }
+
+}
+
+void __glXScreenReset(void)
+{
+  __glXNumActiveScreens = 0;
+}
+
+char *__glXGetServerString( unsigned int name ) 
+{
+   char *ret = NULL;
+
+   switch( name) {
+
+      case GLX_VENDOR:
+	 ret = GLXServerVendorName;
+	 break;
+
+      case GLX_VERSION:
+	 ret = GLXServerVersion;
+	 break;
+
+      case GLX_EXTENSIONS:
+	 ret = ExtensionsString;
+	 break;
+
+      default:
+	 break;
+   }
+
+   return ret;
+
+}
+
+int glxIsExtensionSupported( char *ext )
+{
+   return( strstr(ExtensionsString, ext) != NULL );
+}
diff --git a/xorg-server/hw/dmx/glxProxy/glxserver.h b/xorg-server/hw/dmx/glxProxy/glxserver.h
index b2be58219..03e95b865 100644
--- a/xorg-server/hw/dmx/glxProxy/glxserver.h
+++ b/xorg-server/hw/dmx/glxProxy/glxserver.h
@@ -1,309 +1,303 @@
-#ifndef _GLX_server_h_

-#define _GLX_server_h_

-

-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

- * shall be included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#include "dmx.h"

-

-#include <misc.h>

-#include <dixstruct.h>

-#include <pixmapstr.h>

-#include <gcstruct.h>

-#include <extnsionst.h>

-#include <resource.h>

-#include <scrnintstr.h>

-

-

-/*

-** The X header misc.h defines these math functions.

-*/

-#undef abs

-#undef fabs

-

-#define GL_GLEXT_PROTOTYPES /* we want prototypes */

-#include <GL/gl.h>

-#include <GL/glxproto.h>

-#include <GL/glxint.h>

-

-#include "glxscreens.h"

-#include "glxdrawable.h"

-#include "glxcontext.h"

-#include "glxerror.h"

-

-

-#define GLX_SERVER_MAJOR_VERSION 1

-#define GLX_SERVER_MINOR_VERSION 3

-

-#ifndef True

-#define True 1

-#endif

-#ifndef False

-#define False 0

-#endif

-

-/*

-** GLX resources.

-typedef XID GLXContextID;

-typedef XID GLXPixmap;

-typedef XID GLXDrawable;

-typedef XID GLXWindow;

-typedef XID GLXPbuffer;

-

-typedef struct __GLXcontextRec *GLXContext;

-*/

-typedef struct __GLXclientStateRec __GLXclientState;

-

-extern __GLXscreenInfo *__glXActiveScreens;

-extern GLint __glXNumActiveScreens;

-

-/************************************************************************/

-

-/*

-** The last context used (from the server's persective) is cached.

-*/

-extern __GLXcontext *__glXLastContext;

-extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*);

-

-/************************************************************************/

-

-typedef struct {

-   int elem_size;  /* element size in bytes */

-   int nelems;     /* number of elements to swap */

-   void (*swapfunc)(GLbyte *pc);

-} __GLXRenderSwapInfo;

-

-/*

-** State kept per client.

-*/

-struct __GLXclientStateRec {

-    /*

-    ** Whether this structure is currently being used to support a client.

-    */

-    Bool inUse;

-

-    /*

-    ** Buffer for returned data.

-    */

-    GLbyte *returnBuf;

-    GLint returnBufSize;

-

-    /*

-    ** Keep a list of all the contexts that are current for this client's

-    ** threads.

-    */

-    __GLXcontext **currentContexts;

-    DrawablePtr *currentDrawables;

-    GLint numCurrentContexts;

-

-    /* Back pointer to X client record */

-    ClientPtr client;

-

-    int GLClientmajorVersion;

-    int GLClientminorVersion;

-    char *GLClientextensions;

-

-    GLXContextTag  *be_currentCTag;

-    Display **be_displays;

-

-    /*

-    ** Keep track of large rendering commands, which span multiple requests.

-    */

-    GLint largeCmdBytesSoFar;		/* bytes received so far	*/

-    GLint largeCmdBytesTotal;		/* total bytes expected		*/

-    GLint largeCmdRequestsSoFar;	/* requests received so far	*/

-    GLint largeCmdRequestsTotal;	/* total requests expected	*/

-    void (*largeCmdRequestsSwapProc)(GLbyte *); 

-    __GLXRenderSwapInfo  *largeCmdRequestsSwap_info;

-    GLbyte *largeCmdBuf;

-    GLint largeCmdBufSize;

-    GLint largeCmdMaxReqDataSize;

-

-};

-

-extern __GLXclientState *__glXClients[];

-

-/************************************************************************/

-

-/*

-** Dispatch tables.

-*/

-typedef void (*__GLXdispatchRenderProcPtr)(GLbyte *);

-typedef int (*__GLXdispatchSingleProcPtr)(__GLXclientState *, GLbyte *);

-typedef int (*__GLXdispatchVendorPrivProcPtr)(__GLXclientState *, GLbyte *);

-extern __GLXdispatchSingleProcPtr __glXSingleTable[];

-extern __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[];

-extern __GLXdispatchSingleProcPtr __glXSwapSingleTable[];

-extern __GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[];

-extern __GLXdispatchRenderProcPtr __glXSwapRenderTable[];

-

-extern __GLXRenderSwapInfo __glXSwapRenderTable_EXT[];

-

-/*

- * Dispatch for GLX commands.

- */

-typedef int (*__GLXprocPtr)(__GLXclientState *, char *pc);

-extern __GLXprocPtr __glXProcTable[];

-

-/*

- * Tables for computing the size of each rendering command.

- */

-typedef struct {

-    int bytes;

-    int (*varsize)(GLbyte *pc, Bool swap);

-} __GLXrenderSizeData;

-extern __GLXrenderSizeData __glXRenderSizeTable[];

-extern __GLXrenderSizeData __glXRenderSizeTable_EXT[];

-

-/************************************************************************/

-

-/*

-** X resources.

-*/

-extern RESTYPE __glXContextRes;

-extern RESTYPE __glXClientRes;

-extern RESTYPE __glXPixmapRes;

-extern RESTYPE __glXDrawableRes;

-extern RESTYPE __glXWindowRes;

-extern RESTYPE __glXPbufferRes;

-

-/************************************************************************/

-

-/*

-** Prototypes.

-*/

-

-

-extern char *__glXcombine_strings(const char *, const char *);

-

-extern void __glXDisp_DrawArrays(GLbyte*);

-extern void __glXDispSwap_DrawArrays(GLbyte*);

-

-

-/*

-** Routines for sending swapped replies.

-*/

-

-extern void __glXSwapMakeCurrentReply(ClientPtr client,  

-                                      xGLXMakeCurrentReadSGIReply *reply);

-

-extern void __glXSwapIsDirectReply(ClientPtr client,

-				   xGLXIsDirectReply *reply);

-extern void __glXSwapQueryVersionReply(ClientPtr client,

-				       xGLXQueryVersionReply *reply);

-extern void __glXSwapQueryContextInfoEXTReply(ClientPtr client,

-					      xGLXQueryContextInfoEXTReply *reply,

-					      int *buf);

-extern void glxSwapQueryExtensionsStringReply(ClientPtr client,

-				xGLXQueryExtensionsStringReply *reply, char *buf);

-extern void glxSwapQueryServerStringReply(ClientPtr client,

-				xGLXQueryServerStringReply *reply, char *buf);

-extern void __glXSwapQueryContextReply(ClientPtr client,

-                                xGLXQueryContextReply *reply, int *buf);

-extern void __glXSwapGetDrawableAttributesReply(ClientPtr client,

-                             xGLXGetDrawableAttributesReply *reply, int *buf);

-extern void __glXSwapQueryMaxSwapBarriersSGIXReply(ClientPtr client,

-				   xGLXQueryMaxSwapBarriersSGIXReply *reply);

-

-/*

- * Routines for computing the size of variably-sized rendering commands.

- */

-

-extern int __glXTypeSize(GLenum enm);

-extern int __glXImageSize(GLenum format, GLenum type, GLsizei w, GLsizei h,

-			  GLint rowLength, GLint skipRows, GLint alignment);

-extern int __glXImage3DSize(GLenum format, GLenum type,

-			    GLsizei w, GLsizei h, GLsizei d,

-			    GLint imageHeight, GLint rowLength,

-			    GLint skipImages, GLint skipRows,

-			    GLint alignment);

-

-extern int __glXCallListsReqSize(GLbyte *pc, Bool swap);

-extern int __glXBitmapReqSize(GLbyte *pc, Bool swap);

-extern int __glXFogfvReqSize(GLbyte *pc, Bool swap);

-extern int __glXFogivReqSize(GLbyte *pc, Bool swap);

-extern int __glXLightfvReqSize(GLbyte *pc, Bool swap);

-extern int __glXLightivReqSize(GLbyte *pc, Bool swap);

-extern int __glXLightModelfvReqSize(GLbyte *pc, Bool swap);

-extern int __glXLightModelivReqSize(GLbyte *pc, Bool swap);

-extern int __glXMaterialfvReqSize(GLbyte *pc, Bool swap);

-extern int __glXMaterialivReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexParameterfvReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexParameterivReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexImage1DReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexImage2DReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexEnvfvReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexEnvivReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexGendvReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexGenfvReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexGenivReqSize(GLbyte *pc, Bool swap);

-extern int __glXMap1dReqSize(GLbyte *pc, Bool swap);

-extern int __glXMap1fReqSize(GLbyte *pc, Bool swap);

-extern int __glXMap2dReqSize(GLbyte *pc, Bool swap);

-extern int __glXMap2fReqSize(GLbyte *pc, Bool swap);

-extern int __glXPixelMapfvReqSize(GLbyte *pc, Bool swap);

-extern int __glXPixelMapuivReqSize(GLbyte *pc, Bool swap);

-extern int __glXPixelMapusvReqSize(GLbyte *pc, Bool swap);

-extern int __glXDrawPixelsReqSize(GLbyte *pc, Bool swap);

-extern int __glXDrawArraysSize(GLbyte *pc, Bool swap);

-extern int __glXPrioritizeTexturesReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexSubImage1DReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexSubImage2DReqSize(GLbyte *pc, Bool swap);

-extern int __glXTexImage3DReqSize(GLbyte *pc, Bool swap );

-extern int __glXTexSubImage3DReqSize(GLbyte *pc, Bool swap);

-extern int __glXConvolutionFilter1DReqSize(GLbyte *pc, Bool swap);

-extern int __glXConvolutionFilter2DReqSize(GLbyte *pc, Bool swap);

-extern int __glXConvolutionParameterivReqSize(GLbyte *pc, Bool swap);

-extern int __glXConvolutionParameterfvReqSize(GLbyte *pc, Bool swap);

-extern int __glXSeparableFilter2DReqSize(GLbyte *pc, Bool swap);

-extern int __glXColorTableReqSize(GLbyte *pc, Bool swap);

-extern int __glXColorSubTableReqSize(GLbyte *pc, Bool swap);

-extern int __glXColorTableParameterfvReqSize(GLbyte *pc, Bool swap);

-extern int __glXColorTableParameterivReqSize(GLbyte *pc, Bool swap);

-

-/*

- * Routines for computing the size of returned data.

- */

-extern int __glXConvolutionParameterivSize(GLenum pname);

-extern int __glXConvolutionParameterfvSize(GLenum pname);

-extern int __glXColorTableParameterfvSize(GLenum pname);

-extern int __glXColorTableParameterivSize(GLenum pname);

-

-extern void __glXFreeGLXWindow(__glXWindow *pGlxWindow);

-extern void __glXFreeGLXPbuffer(__glXPbuffer *pGlxPbuffer);

-

-extern int __glXVersionMajor;

-extern int __glXVersionMinor;

-

-#define __GLX_IS_VERSION_SUPPORTED(major,minor) \

-         ( (__glXVersionMajor > (major)) || \

-           ((__glXVersionMajor == (major)) && (__glXVersionMinor >= (minor))) )

-

-#endif /* !__GLX_server_h__ */

+#ifndef _GLX_server_h_
+#define _GLX_server_h_
+
+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#include "dmx.h"
+
+#include <misc.h>
+#include <dixstruct.h>
+#include <pixmapstr.h>
+#include <gcstruct.h>
+#include <extnsionst.h>
+#include <resource.h>
+#include <scrnintstr.h>
+
+
+#define GL_GLEXT_PROTOTYPES /* we want prototypes */
+#include <GL/gl.h>
+#include <GL/glxproto.h>
+#include <GL/glxint.h>
+
+#include "glxscreens.h"
+#include "glxdrawable.h"
+#include "glxcontext.h"
+#include "glxerror.h"
+
+
+#define GLX_SERVER_MAJOR_VERSION 1
+#define GLX_SERVER_MINOR_VERSION 3
+
+#ifndef True
+#define True 1
+#endif
+#ifndef False
+#define False 0
+#endif
+
+/*
+** GLX resources.
+typedef XID GLXContextID;
+typedef XID GLXPixmap;
+typedef XID GLXDrawable;
+typedef XID GLXWindow;
+typedef XID GLXPbuffer;
+
+typedef struct __GLXcontextRec *GLXContext;
+*/
+typedef struct __GLXclientStateRec __GLXclientState;
+
+extern __GLXscreenInfo *__glXActiveScreens;
+extern GLint __glXNumActiveScreens;
+
+/************************************************************************/
+
+/*
+** The last context used (from the server's persective) is cached.
+*/
+extern __GLXcontext *__glXLastContext;
+extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*);
+
+/************************************************************************/
+
+typedef struct {
+   int elem_size;  /* element size in bytes */
+   int nelems;     /* number of elements to swap */
+   void (*swapfunc)(GLbyte *pc);
+} __GLXRenderSwapInfo;
+
+/*
+** State kept per client.
+*/
+struct __GLXclientStateRec {
+    /*
+    ** Whether this structure is currently being used to support a client.
+    */
+    Bool inUse;
+
+    /*
+    ** Buffer for returned data.
+    */
+    GLbyte *returnBuf;
+    GLint returnBufSize;
+
+    /*
+    ** Keep a list of all the contexts that are current for this client's
+    ** threads.
+    */
+    __GLXcontext **currentContexts;
+    DrawablePtr *currentDrawables;
+    GLint numCurrentContexts;
+
+    /* Back pointer to X client record */
+    ClientPtr client;
+
+    int GLClientmajorVersion;
+    int GLClientminorVersion;
+    char *GLClientextensions;
+
+    GLXContextTag  *be_currentCTag;
+    Display **be_displays;
+
+    /*
+    ** Keep track of large rendering commands, which span multiple requests.
+    */
+    GLint largeCmdBytesSoFar;		/* bytes received so far	*/
+    GLint largeCmdBytesTotal;		/* total bytes expected		*/
+    GLint largeCmdRequestsSoFar;	/* requests received so far	*/
+    GLint largeCmdRequestsTotal;	/* total requests expected	*/
+    void (*largeCmdRequestsSwapProc)(GLbyte *); 
+    __GLXRenderSwapInfo  *largeCmdRequestsSwap_info;
+    GLbyte *largeCmdBuf;
+    GLint largeCmdBufSize;
+    GLint largeCmdMaxReqDataSize;
+
+};
+
+extern __GLXclientState *__glXClients[];
+
+/************************************************************************/
+
+/*
+** Dispatch tables.
+*/
+typedef void (*__GLXdispatchRenderProcPtr)(GLbyte *);
+typedef int (*__GLXdispatchSingleProcPtr)(__GLXclientState *, GLbyte *);
+typedef int (*__GLXdispatchVendorPrivProcPtr)(__GLXclientState *, GLbyte *);
+extern __GLXdispatchSingleProcPtr __glXSingleTable[];
+extern __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[];
+extern __GLXdispatchSingleProcPtr __glXSwapSingleTable[];
+extern __GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[];
+extern __GLXdispatchRenderProcPtr __glXSwapRenderTable[];
+
+extern __GLXRenderSwapInfo __glXSwapRenderTable_EXT[];
+
+/*
+ * Dispatch for GLX commands.
+ */
+typedef int (*__GLXprocPtr)(__GLXclientState *, char *pc);
+extern __GLXprocPtr __glXProcTable[];
+
+/*
+ * Tables for computing the size of each rendering command.
+ */
+typedef struct {
+    int bytes;
+    int (*varsize)(GLbyte *pc, Bool swap);
+} __GLXrenderSizeData;
+extern __GLXrenderSizeData __glXRenderSizeTable[];
+extern __GLXrenderSizeData __glXRenderSizeTable_EXT[];
+
+/************************************************************************/
+
+/*
+** X resources.
+*/
+extern RESTYPE __glXContextRes;
+extern RESTYPE __glXClientRes;
+extern RESTYPE __glXPixmapRes;
+extern RESTYPE __glXDrawableRes;
+extern RESTYPE __glXWindowRes;
+extern RESTYPE __glXPbufferRes;
+
+/************************************************************************/
+
+/*
+** Prototypes.
+*/
+
+
+extern char *__glXcombine_strings(const char *, const char *);
+
+extern void __glXDisp_DrawArrays(GLbyte*);
+extern void __glXDispSwap_DrawArrays(GLbyte*);
+
+
+/*
+** Routines for sending swapped replies.
+*/
+
+extern void __glXSwapMakeCurrentReply(ClientPtr client,  
+                                      xGLXMakeCurrentReadSGIReply *reply);
+
+extern void __glXSwapIsDirectReply(ClientPtr client,
+				   xGLXIsDirectReply *reply);
+extern void __glXSwapQueryVersionReply(ClientPtr client,
+				       xGLXQueryVersionReply *reply);
+extern void __glXSwapQueryContextInfoEXTReply(ClientPtr client,
+					      xGLXQueryContextInfoEXTReply *reply,
+					      int *buf);
+extern void glxSwapQueryExtensionsStringReply(ClientPtr client,
+				xGLXQueryExtensionsStringReply *reply, char *buf);
+extern void glxSwapQueryServerStringReply(ClientPtr client,
+				xGLXQueryServerStringReply *reply, char *buf);
+extern void __glXSwapQueryContextReply(ClientPtr client,
+                                xGLXQueryContextReply *reply, int *buf);
+extern void __glXSwapGetDrawableAttributesReply(ClientPtr client,
+                             xGLXGetDrawableAttributesReply *reply, int *buf);
+extern void __glXSwapQueryMaxSwapBarriersSGIXReply(ClientPtr client,
+				   xGLXQueryMaxSwapBarriersSGIXReply *reply);
+
+/*
+ * Routines for computing the size of variably-sized rendering commands.
+ */
+
+extern int __glXTypeSize(GLenum enm);
+extern int __glXImageSize(GLenum format, GLenum type, GLsizei w, GLsizei h,
+			  GLint rowLength, GLint skipRows, GLint alignment);
+extern int __glXImage3DSize(GLenum format, GLenum type,
+			    GLsizei w, GLsizei h, GLsizei d,
+			    GLint imageHeight, GLint rowLength,
+			    GLint skipImages, GLint skipRows,
+			    GLint alignment);
+
+extern int __glXCallListsReqSize(GLbyte *pc, Bool swap);
+extern int __glXBitmapReqSize(GLbyte *pc, Bool swap);
+extern int __glXFogfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXFogivReqSize(GLbyte *pc, Bool swap);
+extern int __glXLightfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXLightivReqSize(GLbyte *pc, Bool swap);
+extern int __glXLightModelfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXLightModelivReqSize(GLbyte *pc, Bool swap);
+extern int __glXMaterialfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXMaterialivReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexParameterfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexParameterivReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexImage1DReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexImage2DReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexEnvfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexEnvivReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexGendvReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexGenfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexGenivReqSize(GLbyte *pc, Bool swap);
+extern int __glXMap1dReqSize(GLbyte *pc, Bool swap);
+extern int __glXMap1fReqSize(GLbyte *pc, Bool swap);
+extern int __glXMap2dReqSize(GLbyte *pc, Bool swap);
+extern int __glXMap2fReqSize(GLbyte *pc, Bool swap);
+extern int __glXPixelMapfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXPixelMapuivReqSize(GLbyte *pc, Bool swap);
+extern int __glXPixelMapusvReqSize(GLbyte *pc, Bool swap);
+extern int __glXDrawPixelsReqSize(GLbyte *pc, Bool swap);
+extern int __glXDrawArraysSize(GLbyte *pc, Bool swap);
+extern int __glXPrioritizeTexturesReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexSubImage1DReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexSubImage2DReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexImage3DReqSize(GLbyte *pc, Bool swap );
+extern int __glXTexSubImage3DReqSize(GLbyte *pc, Bool swap);
+extern int __glXConvolutionFilter1DReqSize(GLbyte *pc, Bool swap);
+extern int __glXConvolutionFilter2DReqSize(GLbyte *pc, Bool swap);
+extern int __glXConvolutionParameterivReqSize(GLbyte *pc, Bool swap);
+extern int __glXConvolutionParameterfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXSeparableFilter2DReqSize(GLbyte *pc, Bool swap);
+extern int __glXColorTableReqSize(GLbyte *pc, Bool swap);
+extern int __glXColorSubTableReqSize(GLbyte *pc, Bool swap);
+extern int __glXColorTableParameterfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXColorTableParameterivReqSize(GLbyte *pc, Bool swap);
+
+/*
+ * Routines for computing the size of returned data.
+ */
+extern int __glXConvolutionParameterivSize(GLenum pname);
+extern int __glXConvolutionParameterfvSize(GLenum pname);
+extern int __glXColorTableParameterfvSize(GLenum pname);
+extern int __glXColorTableParameterivSize(GLenum pname);
+
+extern void __glXFreeGLXWindow(__glXWindow *pGlxWindow);
+extern void __glXFreeGLXPbuffer(__glXPbuffer *pGlxPbuffer);
+
+extern int __glXVersionMajor;
+extern int __glXVersionMinor;
+
+#define __GLX_IS_VERSION_SUPPORTED(major,minor) \
+         ( (__glXVersionMajor > (major)) || \
+           ((__glXVersionMajor == (major)) && (__glXVersionMinor >= (minor))) )
+
+#endif /* !__GLX_server_h__ */
diff --git a/xorg-server/hw/dmx/glxProxy/render2swap.c b/xorg-server/hw/dmx/glxProxy/render2swap.c
index 81bb501ea..da9b565de 100644
--- a/xorg-server/hw/dmx/glxProxy/render2swap.c
+++ b/xorg-server/hw/dmx/glxProxy/render2swap.c
@@ -32,7 +32,7 @@
 #include "unpack.h"
 #include "g_disptab.h"
 
-GLint __glEvalComputeK(GLenum target)
+static GLint __glEvalComputeK(GLenum target)
 {
     switch (target) {
     case GL_MAP1_VERTEX_4: