xserver/GL/mesa/X xf86glx.c,1.8,1.9

[Dave Airlie]

Committed by: airlied

Update of /cvs/xserver/xserver/GL/mesa/X
In directory gabe:/tmp/cvs-serv9922/GL/mesa/X

Modified Files:
	xf86glx.c 
Log Message:
this gets rid of the xf86glxddx library and uses weak symbols so that
the kdrive and the xgl servers work from one build


Index: xf86glx.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/mesa/X/xf86glx.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xf86glx.c	3 Jan 2006 09:43:40 -0000	1.8
+++ xf86glx.c	4 Jan 2006 12:42:30 -0000	1.9
@@ -580,6 +580,11 @@
   },
 };
 
+void *__glXMalloc(size_t size) __attribute__((weak));
+void *__glXCalloc(size_t numElements, size_t elementSize) __attribute__((weak));
+void *__glXRealloc(void *addr, size_t newSize) __attribute__((weak));
+void __glXFree(void *addr) __attribute__((weak));
+
 void *
 __glXMalloc(size_t size)
 {
@@ -1319,3 +1324,27 @@
     ErrorF("__MESA_endDispatchOverride\n");
     return;
 }
+
+
+
+__GLXextensionInfo __glDDXExtensionInfo __attribute__((weak)) = {
+  GL_CORE_MESA,
+  __MESA_resetExtension,
+  __MESA_initVisuals,
+  __MESA_setVisualConfigs
+};
+
+__GLXscreenInfo __glDDXScreenInfo __attribute__((weak)) = {
+  __MESA_screenProbe,   /* Must be generic and handle all screens */
+  __MESA_createContext, /* Substitute screen's createContext routine */
+  __MESA_createBuffer,  /* Substitute screen's createBuffer routine */
+  NULL,
+  NULL,
+  0,
+  0,
+  "Vendor String",
+  "Version String",
+  "Extensions String",
+  NULL
+};
+