xserver/hw/xgl/glxext xglglxext.c,1.3,1.4 xglglxlog.c,1.2,1.3

[David Reveman]

Committed by: davidr

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

Modified Files:
	xglglxext.c xglglxlog.c 
Log Message:
Fix GLX render tables in Xgl

Index: xglglxext.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glxext/xglglxext.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xglglxext.c	5 Jan 2006 12:01:25 -0000	1.3
+++ xglglxext.c	9 Jan 2006 00:36:04 -0000	1.4
@@ -268,7 +268,7 @@
     int			      refcnt;
     struct _xglGLContext      *shared;
     glitz_context_t	      *context;
-    __glProcTableEXT	      glRenderTableEXT;
+    struct _glapi_table	      glRenderTable;
     PFNGLACTIVETEXTUREARBPROC ActiveTextureARB;
     PFNGLWINDOWPOS3FMESAPROC  WindowPos3fMESA;
     Bool		      needInit;
@@ -305,11 +305,11 @@
 
 #define XGL_GLX_DRAW_PROLOGUE_WITHOUT_TEXTURES(pBox, nBox, pScissorBox)	  \
[...2403 lines suppressed...]
 }
 
 static void
@@ -5448,6 +5010,7 @@
     glitz_context_set_user_data (pContext->context, pContext,
 				 xglLoseCurrentContext);
 
+    pContext->glRenderTable = __glNativeRenderTable;
     pContext->needInit	    = TRUE;
     pContext->versionString = NULL;
     pContext->errorValue    = GL_NO_ERROR;
@@ -5848,7 +5411,7 @@
 	    || (!((WindowPtr) pDrawable)->parent))
 #endif
 
-	    )
+	)
     {
 	pBufferPriv->pDrawable = pDrawable;
     }

Index: xglglxlog.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/glxext/xglglxlog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xglglxlog.c	5 Jan 2006 12:01:25 -0000	1.2
+++ xglglxlog.c	9 Jan 2006 00:36:04 -0000	1.3
@@ -29,7 +29,7 @@
 
 #ifndef NGLXEXTLOG
 
-static struct _glapi_table   *nativeRenderTable    = 0;
+static struct _glapi_table *nativeRenderTable = 0;
 
 static FILE *logFp = 0;
 
@@ -254,7 +254,7 @@
     fprintf (logFp, "glAreTexturesResident (%d, %p, %p)\n", n, textures,
 	     residences);
[...1553 lines suppressed...]
 
 static void
 GlxLogFlushContextCache (void)
@@ -4027,15 +4483,13 @@
 static void
 GlxLogSetRenderTables (struct _glapi_table *table)
 {
-    nativeRenderTable    = table;
+    nativeRenderTable = table;
 
     if (table)
     {
 	fprintf (logFp, "FORCE CURRENT\n");
 	isCurrent = TRUE;
 
-	nativeRenderTable = table;
-
 	(*setRenderTables) (&__logRenderTable);
     }
     else