xserver/GL/mesa/X xf86glx.c,1.9,1.10 xf86glxddx.c,1.1,1.2

[Dave Airlie]

Committed by: airlied

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

Modified Files:
	xf86glx.c xf86glxddx.c 
Log Message:
switch GLX and Xgl to use Mesa's "glapitable.h"


Index: xf86glx.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/mesa/X/xf86glx.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- xf86glx.c	4 Jan 2006 12:42:30 -0000	1.9
+++ xf86glx.c	5 Jan 2006 12:01:25 -0000	1.10
@@ -66,368 +66,825 @@
 #include <GL/internal/glcore.h>
 #endif
 
-__glProcTable __glMesaRenderTable = {
-    glNewList,
-    glEndList,
-    glCallList,
-    glCallLists,
-    glDeleteLists,
-    glGenLists,
-    glListBase,
[...1165 lines suppressed...]
+	glFramebufferRenderbufferEXT,
+	glGetFramebufferAttachmentParameterivEXT,
+	glGenerateMipmapEXT,
+	glStencilFuncSeparate,
+	glStencilOpSeparate,
+	glStencilMaskSeparate,
+	glGetQueryObjecti64vEXT,
+	glGetQueryObjectui64vEXT,
 };
 
 extern __GLXextensionInfo __glDDXExtensionInfo;
@@ -1281,7 +1738,7 @@
 {
     XMesaContext xmesa = (XMesaContext) gc->DriverCtx;
     MESA_CC = gc;
-    GlxSetRenderTables (&__glMesaRenderTable, &__glMesaRenderTableEXT);
+    GlxSetRenderTables (&__glMesaRenderTable);
     return XMesaForceCurrent(xmesa);
 }
 

Index: xf86glxddx.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/mesa/X/xf86glxddx.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xf86glxddx.c	23 Dec 2005 03:59:25 -0000	1.1
+++ xf86glxddx.c	5 Jan 2006 12:01:25 -0000	1.2
@@ -26,23 +26,37 @@
 #include "glxserver.h"
 #include "glxext.h"
 
+extern void __MESA_resetExtension(void);
+extern Bool __MESA_initVisuals(VisualPtr *visualp, DepthPtr *depthp,
+			int *nvisualp, int *ndepthp, int *rootDepthp,
+			VisualID *defaultVisp, unsigned long sizes,
+			int bitsPerRGB);
+extern void __MESA_setVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
+				    void **privates);
+extern Bool __MESA_screenProbe(int screen);
+extern __GLinterface *__MESA_createContext(__GLimports *imports,
+				    __GLcontextModes *modes,
+				     __GLinterface *shareGC);
+extern void __MESA_createBuffer(__GLXdrawablePrivate *glxPriv);
+
 __GLXextensionInfo __glDDXExtensionInfo = {
-    GL_CORE_MESA,
-    NULL,
-    NULL,
-    NULL
+  GL_CORE_MESA,
+  __MESA_resetExtension,
+  __MESA_initVisuals,
+  __MESA_setVisualConfigs
 };
 
 __GLXscreenInfo __glDDXScreenInfo = {
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    0,
-    0,
-    "Vendor String",
-    "Version String",
-    "Extensions String",
-    NULL
+  __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
 };
+