[Xorg-commit] xc/programs/Xserver/GL/dri dri.c,1.1.4.1,1.1.4.2 drimodule.c,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/GL/dri
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/GL/dri

Modified Files:
      Tag: XORG-CURRENT
	dri.c drimodule.c 
Log Message:
First pass at "Standard" Xinerama.
The sources for this came from Heather Lanigan's xinerama tree on 
Sourceforge.Net. 
No attempt has been made to handle previous, non-standard versions of 
the protocol. Nor has any attempt been made to preserve the ABI of 
previous versions -- that part will be added at a later time, and 
then probably only on systems that have nice object/linker semantics, 
e.g. ELF systems with weak symbols.



Index: dri.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/dri/dri.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- dri.c	26 Nov 2003 22:48:40 -0000	1.1.4.1
+++ dri.c	18 Dec 2003 19:29:12 -0000	1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.39 2003/11/10 18:21:41 tsi Exp $ */
 /**************************************************************************
 
@@ -66,8 +67,8 @@
 #include "mi.h"
 #include "mipointer.h"
 
-#if defined(XFree86LOADER) && !defined(PANORAMIX)
-extern Bool noPanoramiXExtension;
+#if defined(XFree86LOADER) && !defined(XINERAMA)
+extern Bool noXineramaExtension;
 #endif
 
 static int DRIScreenPrivIndex = -1;
@@ -129,16 +130,16 @@
      * If Xinerama is on, don't allow DRI to initialise.  It won't be usable
      * anyway.
      */
-#if defined(PANORAMIX) && !defined(XFree86LOADER)
+#if defined(XINERAMA) && !defined(XFree86LOADER)
     xineramaInCore = TRUE;
 #elif defined(XFree86LOADER)
-    if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
+    if (xf86LoaderCheckSymbol("noXineramaExtension"))
 	xineramaInCore = TRUE;
 #endif
 
-#if defined(PANORAMIX) || defined(XFree86LOADER)
+#if defined(XINERAMA) || defined(XFree86LOADER)
     if (xineramaInCore) {
-	if (!noPanoramiXExtension) {
+	if (!noXineramaExtension) {
 	    DRIDrvMsg(pScreen->myNum, X_WARNING,
 		"Direct rendering is not supported when Xinerama is enabled\n");
 	    return FALSE;

Index: drimodule.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/dri/drimodule.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- drimodule.c	14 Nov 2003 16:48:51 -0000	1.1
+++ drimodule.c	18 Dec 2003 19:29:12 -0000	1.1.4.1
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /**************************************************************************
 
 Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -109,7 +110,7 @@
 	}
 	else {
 	    LoaderReqSymLists(drmSymbols, NULL);
-	    LoaderRefSymbols("noPanoramiXExtension", NULL);
+	    LoaderRefSymbols("noXineramaExtension", NULL);
 	    LoadExtension(&XF86DRIExt, FALSE);
 	}
     } else {