xserver/hw/xgl/glxext Makefile.am, 1.1, 1.2 xglglxext.c, 1.1, 1.2 xglglxext.h, 1.2, 1.3 xglglxlog.c, NONE, 1.1

[Dave Airlie]

Committed by: airlied

Update of /cvs/xserver/xserver/hw/xgl/glxext
In directory gabe:/tmp/cvs-serv16345/glxext

Modified Files:
	Makefile.am xglglxext.c xglglxext.h 
Added Files:
	xglglxlog.c 
Log Message:
commit all Xgl changes from Xgl code drop (EGL still to do)


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glxext/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	23 Dec 2005 02:07:58 -0000	1.1
+++ Makefile.am	3 Jan 2006 09:56:22 -0000	1.2
@@ -2,12 +2,14 @@
 
 INCLUDES =		 \
 	@XGL_INCS@	 \
-	@XSERVER_CFLAGS@
+	@XSERVER_CFLAGS@ \
+	@XGLSERVER_CFLAGS@
 
 libxglglxext_libraries = libxglglxext.la
 libxglglxext_la_SOURCES = \
 	xglglxext.h	  \
-	xglglxext.c
+	xglglxext.c       \
+	xglglxlog.c
 
 noinst_LTLIBRARIES = $(libxglglxext_libraries)
 

Index: xglglxext.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glxext/xglglxext.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xglglxext.c	23 Dec 2005 02:07:58 -0000	1.1
+++ xglglxext.c	3 Jan 2006 09:56:22 -0000	1.2
@@ -12,11 +12,11 @@
  * software for any purpose. It is provided "as is" without express or
  * implied warranty.
  *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
  * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, 
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
[...3285 lines suppressed...]
 	pConfig[i].level      = 0;
-	
+
 	pConfig[i].visualRating = GLX_NONE;
-	
+
 	pConfig[i].transparentPixel = GLX_NONE;
 	pConfig[i].transparentRed   = 0;
 	pConfig[i].transparentGreen = 0;
@@ -5060,6 +5301,10 @@
     pScreen->rootDepth     = rootDepth;
     pScreen->rootVisual    = defaultVis;
 
+#ifndef NGLXLOG
+    xglInitGlxLog ();
+#endif
+
     xfree (installedCmaps);
     xfree (pConfigPriv);
     xfree (pConfig);

Index: xglglxext.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glxext/xglglxext.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xglglxext.h	3 Jan 2006 07:39:40 -0000	1.2
+++ xglglxext.h	3 Jan 2006 09:56:22 -0000	1.3
@@ -12,11 +12,11 @@
  * software for any purpose. It is provided "as is" without express or
  * implied warranty.
  *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
  * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, 
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
@@ -31,4 +31,11 @@
 Bool
 xglInitVisualConfigs (ScreenPtr pScreen);
 
+#ifndef NGLXEXTLOG
+
+void
+xglInitGlxLog (void);
+
+#endif
+
 #endif /* _XGL_GLXEXT_H_ */

--- NEW FILE: xglglxlog.c ---
(This appears to be a binary file; contents omitted.)