xserver/hw/xgl/glx xglxinit.c,1.2,1.3

[David Reveman]

Committed by: davidr

Update of /cvs/xserver/xserver/hw/xgl/glx
In directory gabe:/tmp/cvs-serv7161/hw/xgl/glx

Modified Files:
	xglxinit.c 
Log Message:
Make Xglx and Xegl build

Index: xglxinit.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glx/xglxinit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xglxinit.c	3 Jan 2006 09:56:22 -0000	1.2
+++ xglxinit.c	3 Jan 2006 16:16:37 -0000	1.3
@@ -24,8 +24,9 @@
  */
 
 #include "xglx.h"
+#include "xglglx.h"
 
-static xglScreenInfoRec xglxScreenInfo = {
+xglScreenInfoRec xglScreenInfo = {
     NULL, 0, 0, 0, 0, 0,
     DEFAULT_GEOMETRY_DATA_TYPE,
     DEFAULT_GEOMETRY_USAGE,
@@ -42,6 +43,11 @@
 
 #ifdef GLXEXT
 static Bool loadGlx = TRUE;
+
+#ifndef NGLXEXTLOG
+static char *glxExtLogFile = 0;
+#endif
+
 #endif
 
 void
@@ -55,10 +61,22 @@
     {
 	if (!xglLoadGLXModules ())
 	    FatalError ("No GLX modules loaded");
+
+#ifndef NGLXEXTLOG
+	if (glxExtLogFile)
+	{
+	    __xglGLXLogFp = fopen (glxExtLogFile, "w");
+	    if (!__xglGLXLogFp)
+		perror ("InitOutput");
+	}
+	else
+	    __xglGLXLogFp = 0;
+#endif
+
     }
 #endif
 
-    xglxInitOutput (&xglxScreenInfo, pScreenInfo, argc, argv);
+    xglxInitOutput (pScreenInfo, argc, argv);
 }
 
 Bool
@@ -78,7 +96,7 @@
 InitInput (int  argc,
 	   char **argv)
 {
-    xglxInitInput (&xglxScreenInfo, argc, argv);
+    xglxInitInput (argc, argv);
 }
 
 void
@@ -88,6 +106,11 @@
 
 #ifdef GLXEXT
     ErrorF ("-noglx                 don't load glx extension\n");
+
+#ifndef NGLXEXTLOG
+    ErrorF ("-glxlog file           glx extension log file\n");
+#endif
+
 #endif
 
     xglUseMsg ();
@@ -108,13 +131,22 @@
 	loadGlx = FALSE;
 	return 1;
     }
+
+#ifndef NGLXEXTLOG
+    else if (!strcmp (argv[i], "-glxlog"))
+    {
+	if (++i < argc)
+	    glxExtLogFile = argv[i];
+    }
 #endif
 
-    skip = xglProcessArgument (&xglxScreenInfo, argc, argv, i);
+#endif
+
+    skip = xglProcessArgument (argc, argv, i);
     if (skip)
 	return skip;
 
-    return xglxProcessArgument (&xglxScreenInfo, argc, argv, i);
+    return xglxProcessArgument (argc, argv, i);
 }
 
 void