xserver/GL/glx Makefile.am, 1.3, 1.4 g_render.c, 1.8, 1.9 g_renderswap.c, 1.7, 1.8 g_single.c, 1.6, 1.7 g_singleswap.c, 1.6, 1.7 glxcmds.c, 1.17, 1.18 glxcmdsswap.c, 1.9, 1.10 glxserver.h, 1.11, 1.12 render2.c, 1.5, 1.6 render2swap.c, 1.5, 1.6 renderpix.c, 1.4, 1.5 renderpixswap.c, 1.4, 1.5 single2.c, 1.6, 1.7 single2swap.c, 1.5, 1.6 singlepix.c, 1.4, 1.5 singlepixswap.c, 1.5, 1.6 singlesize.c, 1.10, 1.11 xfont.c, 1.4, 1.5

Dave Airlie xserver-commit at pdx.freedesktop.org
Thu Jan 5 04:01:27 PST 2006 

Committed by: airlied

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

Modified Files:
	Makefile.am g_render.c g_renderswap.c g_single.c 
	g_singleswap.c glxcmds.c glxcmdsswap.c glxserver.h render2.c 
	render2swap.c renderpix.c renderpixswap.c single2.c 
	single2swap.c singlepix.c singlepixswap.c singlesize.c xfont.c 
Log Message:
switch GLX and Xgl to use Mesa's "glapitable.h"


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	23 Dec 2005 02:07:57 -0000	1.3
+++ Makefile.am	5 Jan 2006 12:01:24 -0000	1.4
@@ -10,6 +10,7 @@
 	-I$(top_srcdir)/Xext			\
 	-I$(top_srcdir)/render			\
 	-I at MESA_SOURCE@/include			\
+	-I at MESA_SOURCE@/src/mesa/glapi		\
 	@XSERVER_CFLAGS@
 
 libglx_la_SOURCES = \

Index: g_render.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/g_render.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- g_render.c	7 Jun 2005 15:25:02 -0000	1.8
+++ g_render.c	5 Jan 2006 12:01:24 -0000	1.9
@@ -31,8 +31,9 @@
 
 #define NEED_REPLIES
 #include "glxserver.h"
-#include "glxext.h"
 #include "g_disptab.h"
+#include "glapitable.h"
+#include "glxext.h"
 #include "g_disptab_EXT.h"
 #include "unpack.h"
 #include "impsize.h"
@@ -192,18 +193,18 @@
 		      (type *)   (pc + 4) ); \
     }
 
-dispatch_template_1( FogCoordfv,         (*__glRenderTableEXT->FogCoordfvEXT), GLfloat )
-dispatch_template_1( FogCoorddv,         (*__glRenderTableEXT->FogCoorddvEXT), GLdouble )
-dispatch_template_3( SecondaryColor3bv,  (*__glRenderTableEXT->SecondaryColor3bvEXT), GLbyte )
-dispatch_template_3( SecondaryColor3sv,  (*__glRenderTableEXT->SecondaryColor3svEXT), GLshort )
-dispatch_template_3( SecondaryColor3iv,  (*__glRenderTableEXT->SecondaryColor3ivEXT), GLint )
-dispatch_template_3( SecondaryColor3ubv, (*__glRenderTableEXT->SecondaryColor3ubvEXT), GLubyte )
-dispatch_template_3( SecondaryColor3usv, (*__glRenderTableEXT->SecondaryColor3usvEXT), GLushort )
-dispatch_template_3( SecondaryColor3uiv, (*__glRenderTableEXT->SecondaryColor3uivEXT), GLuint )
-dispatch_template_3( SecondaryColor3fv,  (*__glRenderTableEXT->SecondaryColor3fvEXT), GLfloat )
-dispatch_template_3( SecondaryColor3dv,  (*__glRenderTableEXT->SecondaryColor3dvEXT), GLdouble )
+dispatch_template_1( FogCoordfv,         (*__glRenderTable->FogCoordfvEXT), GLfloat )
+dispatch_template_1( FogCoorddv,         (*__glRenderTable->FogCoorddvEXT), GLdouble )
+dispatch_template_3( SecondaryColor3bv,  (*__glRenderTable->SecondaryColor3bvEXT), GLbyte )
+dispatch_template_3( SecondaryColor3sv,  (*__glRenderTable->SecondaryColor3svEXT), GLshort )
+dispatch_template_3( SecondaryColor3iv,  (*__glRenderTable->SecondaryColor3ivEXT), GLint )
+dispatch_template_3( SecondaryColor3ubv, (*__glRenderTable->SecondaryColor3ubvEXT), GLubyte )
+dispatch_template_3( SecondaryColor3usv, (*__glRenderTable->SecondaryColor3usvEXT), GLushort )
+dispatch_template_3( SecondaryColor3uiv, (*__glRenderTable->SecondaryColor3uivEXT), GLuint )
+dispatch_template_3( SecondaryColor3fv,  (*__glRenderTable->SecondaryColor3fvEXT), GLfloat )
+dispatch_template_3( SecondaryColor3dv,  (*__glRenderTable->SecondaryColor3dvEXT), GLdouble )
 
-dispatch_template_4s( BlendFuncSeparate,  (*__glRenderTableEXT->BlendFuncSeparateEXT), GLenum )
+dispatch_template_4s( BlendFuncSeparate,  (*__glRenderTable->BlendFuncSeparateEXT), GLenum )
 
 void __glXDisp_Color3bv(GLbyte *pc)
 {
@@ -2060,7 +2061,7 @@
 
 void __glXDisp_ActiveTextureARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->ActiveTextureARB)( 
+	(*__glRenderTable->ActiveTextureARB)( 
 		*(GLenum   *)(pc + 0)
 	);
 }
@@ -2074,7 +2075,7 @@
 	    pc -= 4;
 	}
 #endif
-	(*__glRenderTableEXT->MultiTexCoord1dvARB)( 
+	(*__glRenderTable->MultiTexCoord1dvARB)( 
 		*(GLenum   *)(pc + 8),
 		(GLdouble *)(pc + 0)
 	);
@@ -2082,7 +2083,7 @@
 
 void __glXDisp_MultiTexCoord1fvARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord1fvARB)( 
+	(*__glRenderTable->MultiTexCoord1fvARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLfloat  *)(pc + 4)
 	);
@@ -2090,7 +2091,7 @@
 
 void __glXDisp_MultiTexCoord1ivARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord1ivARB)( 
+	(*__glRenderTable->MultiTexCoord1ivARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLint    *)(pc + 4)
 	);
@@ -2098,7 +2099,7 @@
 
 void __glXDisp_MultiTexCoord1svARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord1svARB)( 
+	(*__glRenderTable->MultiTexCoord1svARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLshort  *)(pc + 4)
 	);
@@ -2113,7 +2114,7 @@
 	    pc -= 4;
 	}
 #endif
-	(*__glRenderTableEXT->MultiTexCoord2dvARB)( 
+	(*__glRenderTable->MultiTexCoord2dvARB)( 
 		*(GLenum   *)(pc + 16),
 		(GLdouble *)(pc + 0)
 	);
@@ -2121,7 +2122,7 @@
 
 void __glXDisp_MultiTexCoord2fvARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord2fvARB)( 
+	(*__glRenderTable->MultiTexCoord2fvARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLfloat  *)(pc + 4)
 	);
@@ -2129,7 +2130,7 @@
 
 void __glXDisp_MultiTexCoord2ivARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord2ivARB)( 
+	(*__glRenderTable->MultiTexCoord2ivARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLint    *)(pc + 4)
 	);
@@ -2137,7 +2138,7 @@
 
 void __glXDisp_MultiTexCoord2svARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord2svARB)( 
+	(*__glRenderTable->MultiTexCoord2svARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLshort  *)(pc + 4)
 	);
@@ -2152,7 +2153,7 @@
 	    pc -= 4;
 	}
 #endif
-	(*__glRenderTableEXT->MultiTexCoord3dvARB)( 
+	(*__glRenderTable->MultiTexCoord3dvARB)( 
 		*(GLenum   *)(pc + 24),
 		(GLdouble *)(pc + 0)
 	);
@@ -2160,7 +2161,7 @@
 
 void __glXDisp_MultiTexCoord3fvARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord3fvARB)( 
+	(*__glRenderTable->MultiTexCoord3fvARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLfloat  *)(pc + 4)
 	);
@@ -2168,7 +2169,7 @@
 
 void __glXDisp_MultiTexCoord3ivARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord3ivARB)( 
+	(*__glRenderTable->MultiTexCoord3ivARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLint    *)(pc + 4)
 	);
@@ -2176,7 +2177,7 @@
 
 void __glXDisp_MultiTexCoord3svARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord3svARB)( 
+	(*__glRenderTable->MultiTexCoord3svARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLshort  *)(pc + 4)
 	);
@@ -2191,7 +2192,7 @@
 	    pc -= 4;
 	}
 #endif
-	(*__glRenderTableEXT->MultiTexCoord4dvARB)( 
+	(*__glRenderTable->MultiTexCoord4dvARB)( 
 		*(GLenum   *)(pc + 32),
 		(GLdouble *)(pc + 0)
 	);
@@ -2199,7 +2200,7 @@
 
 void __glXDisp_MultiTexCoord4fvARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord4fvARB)( 
+	(*__glRenderTable->MultiTexCoord4fvARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLfloat  *)(pc + 4)
 	);
@@ -2207,7 +2208,7 @@
 
 void __glXDisp_MultiTexCoord4ivARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord4ivARB)( 
+	(*__glRenderTable->MultiTexCoord4ivARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLint    *)(pc + 4)
 	);
@@ -2215,7 +2216,7 @@
 
 void __glXDisp_MultiTexCoord4svARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->MultiTexCoord4svARB)( 
+	(*__glRenderTable->MultiTexCoord4svARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLshort  *)(pc + 4)
 	);
@@ -2228,7 +2229,7 @@
 
 void __glXDisp_PointParameterfARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->PointParameterfEXT)(
+	(*__glRenderTable->PointParameterfEXT)(
 		*(GLenum *)(pc + 0),
 		*(GLfloat *)(pc + 4)
 	);
@@ -2237,25 +2238,25 @@
 
 void __glXDisp_PointParameterfvARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->PointParameterfvEXT)(
+	(*__glRenderTable->PointParameterfvEXT)(
 		*(GLenum *)(pc + 0),
 		(GLfloat *)(pc + 4)
 	);
 }
 
-dispatch_template_enum1_1s(PointParameteri,  (*__glRenderTableEXT->PointParameteriNV), GLint)
-dispatch_template_enum1_Vv(PointParameteriv, (*__glRenderTableEXT->PointParameterivNV), GLint)
+dispatch_template_enum1_1s(PointParameteri,  (*__glRenderTable->PointParameteriNV), GLint)
+dispatch_template_enum1_Vv(PointParameteriv, (*__glRenderTable->PointParameterivNV), GLint)
 
 void __glXDisp_ActiveStencilFaceEXT(GLbyte *pc) 
 {
-	(*__glRenderTableEXT->ActiveStencilFaceEXT)(
+	(*__glRenderTable->ActiveStencilFaceEXT)(
 		*(GLenum *)(pc + 0)
 	);
 }
 
 void __glXDisp_WindowPos3fARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->WindowPos3fMESA)(
+	(*__glRenderTable->WindowPos3fMESA)(
 		*(GLfloat *)(pc + 0),
 		*(GLfloat *)(pc + 4),
 		*(GLfloat *)(pc + 8)
@@ -2264,7 +2265,7 @@
 
 void __glXDisp_SampleCoverageARB(GLbyte *pc)
 {
-	(*__glRenderTableEXT->SampleCoverageARB)(
+	(*__glRenderTable->SampleCoverageARB)(
 		*(GLfloat *)(pc + 0),
 		*(GLboolean *)(pc + 4)
 	);

Index: g_renderswap.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/g_renderswap.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- g_renderswap.c	7 Jun 2005 15:25:02 -0000	1.7
+++ g_renderswap.c	5 Jan 2006 12:01:24 -0000	1.8
@@ -33,6 +33,7 @@
 #include "glxext.h"
 #include "g_disptab.h"
 #include "g_disptab_EXT.h"
+#include "glapitable.h"
 #include "unpack.h"
 #include "impsize.h"
 #include "singlesize.h"
@@ -3053,7 +3054,7 @@
 
 	__GLX_SWAP_INT(pc + 0);
 
-	(*__glRenderTableEXT->ActiveTextureARB)( 
+	(*__glRenderTable->ActiveTextureARB)( 
 		*(GLenum   *)(pc + 0)
 	);
 }
@@ -3072,7 +3073,7 @@
 	__GLX_SWAP_INT(pc + 8);
 	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 1);
 
-	(*__glRenderTableEXT->MultiTexCoord1dvARB)( 
+	(*__glRenderTable->MultiTexCoord1dvARB)( 
 		*(GLenum   *)(pc + 8),
 		(GLdouble *)(pc + 0)
 	);
@@ -3086,7 +3087,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 1);
 
-	(*__glRenderTableEXT->MultiTexCoord1fvARB)( 
+	(*__glRenderTable->MultiTexCoord1fvARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLfloat  *)(pc + 4)
 	);
@@ -3100,7 +3101,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_INT_ARRAY(pc + 4, 1);
 
-	(*__glRenderTableEXT->MultiTexCoord1ivARB)( 
+	(*__glRenderTable->MultiTexCoord1ivARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLint    *)(pc + 4)
 	);
@@ -3114,7 +3115,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_SHORT_ARRAY(pc + 4, 1);
 
-	(*__glRenderTableEXT->MultiTexCoord1svARB)( 
+	(*__glRenderTable->MultiTexCoord1svARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLshort  *)(pc + 4)
 	);
@@ -3134,7 +3135,7 @@
 	__GLX_SWAP_INT(pc + 16);
 	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
 
-	(*__glRenderTableEXT->MultiTexCoord2dvARB)( 
+	(*__glRenderTable->MultiTexCoord2dvARB)( 
 		*(GLenum   *)(pc + 16),
 		(GLdouble *)(pc + 0)
 	);
@@ -3148,7 +3149,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 2);
 
-	(*__glRenderTableEXT->MultiTexCoord2fvARB)( 
+	(*__glRenderTable->MultiTexCoord2fvARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLfloat  *)(pc + 4)
 	);
@@ -3162,7 +3163,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_INT_ARRAY(pc + 4, 2);
 
-	(*__glRenderTableEXT->MultiTexCoord2ivARB)( 
+	(*__glRenderTable->MultiTexCoord2ivARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLint    *)(pc + 4)
 	);
@@ -3176,7 +3177,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_SHORT_ARRAY(pc + 4, 2);
 
-	(*__glRenderTableEXT->MultiTexCoord2svARB)( 
+	(*__glRenderTable->MultiTexCoord2svARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLshort  *)(pc + 4)
 	);
@@ -3196,7 +3197,7 @@
 	__GLX_SWAP_INT(pc + 24);
 	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
 
-	(*__glRenderTableEXT->MultiTexCoord3dvARB)( 
+	(*__glRenderTable->MultiTexCoord3dvARB)( 
 		*(GLenum   *)(pc + 24),
 		(GLdouble *)(pc + 0)
 	);
@@ -3210,7 +3211,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 3);
 
-	(*__glRenderTableEXT->MultiTexCoord3fvARB)( 
+	(*__glRenderTable->MultiTexCoord3fvARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLfloat  *)(pc + 4)
 	);
@@ -3224,7 +3225,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_INT_ARRAY(pc + 4, 3);
 
-	(*__glRenderTableEXT->MultiTexCoord3ivARB)( 
+	(*__glRenderTable->MultiTexCoord3ivARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLint    *)(pc + 4)
 	);
@@ -3238,7 +3239,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_SHORT_ARRAY(pc + 4, 3);
 
-	(*__glRenderTableEXT->MultiTexCoord3svARB)( 
+	(*__glRenderTable->MultiTexCoord3svARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLshort  *)(pc + 4)
 	);
@@ -3258,7 +3259,7 @@
 	__GLX_SWAP_INT(pc + 32);
 	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
 
-	(*__glRenderTableEXT->MultiTexCoord4dvARB)( 
+	(*__glRenderTable->MultiTexCoord4dvARB)( 
 		*(GLenum   *)(pc + 32),
 		(GLdouble *)(pc + 0)
 	);
@@ -3272,7 +3273,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 4);
 
-	(*__glRenderTableEXT->MultiTexCoord4fvARB)( 
+	(*__glRenderTable->MultiTexCoord4fvARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLfloat  *)(pc + 4)
 	);
@@ -3286,7 +3287,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_INT_ARRAY(pc + 4, 4);
 
-	(*__glRenderTableEXT->MultiTexCoord4ivARB)( 
+	(*__glRenderTable->MultiTexCoord4ivARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLint    *)(pc + 4)
 	);
@@ -3300,7 +3301,7 @@
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_SHORT_ARRAY(pc + 4, 4);
 
-	(*__glRenderTableEXT->MultiTexCoord4svARB)( 
+	(*__glRenderTable->MultiTexCoord4svARB)( 
 		*(GLenum   *)(pc + 0),
 		(GLshort  *)(pc + 4)
 	);
@@ -3316,7 +3317,7 @@
 	__GLX_DECLARE_SWAP_VARIABLES;
 	__GLX_SWAP_INT(pc + 0);
 	__GLX_SWAP_FLOAT(pc + 4);
-	(*__glRenderTableEXT->PointParameterfEXT)(
+	(*__glRenderTable->PointParameterfEXT)(
 		*(GLenum *)(pc + 0),
 		*(GLfloat *)(pc + 4)
 	);
@@ -3335,7 +3336,7 @@
 	if (compsize < 0) compsize = 0;
 	__GLX_SWAP_FLOAT_ARRAY(pc + 4, compsize);
 
-	(*__glRenderTableEXT->PointParameterfvEXT)(
+	(*__glRenderTable->PointParameterfvEXT)(
 		*(GLenum *)(pc + 0),
 		(GLfloat *)(pc + 4)
 	);
@@ -3347,7 +3348,7 @@
 
 	__GLX_SWAP_INT(pc + 0);
 
-	(*__glRenderTableEXT->ActiveStencilFaceEXT)(
+	(*__glRenderTable->ActiveStencilFaceEXT)(
 		*(GLenum *)(pc + 0)
 	);
 }
@@ -3358,7 +3359,7 @@
 	__GLX_SWAP_FLOAT(pc + 0);
 	__GLX_SWAP_FLOAT(pc + 4);
 	__GLX_SWAP_FLOAT(pc + 8);
-	(*__glRenderTableEXT->WindowPos3fMESA)(
+	(*__glRenderTable->WindowPos3fMESA)(
 		*(GLfloat *)(pc + 0),
 		*(GLfloat *)(pc + 4),
 		*(GLfloat *)(pc + 8)
@@ -3371,7 +3372,7 @@
 	__GLX_SWAP_FLOAT(pc + 0);
 	__GLX_SWAP_INT(pc + 4);
 
-	(*__glRenderTableEXT->SampleCoverageARB)(
+	(*__glRenderTable->SampleCoverageARB)(
 		*(GLfloat *)(pc + 0),
 		*(GLboolean *)(pc + 4)
 	);

Index: g_single.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/g_single.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- g_single.c	10 Jun 2005 12:30:39 -0000	1.6
+++ g_single.c	5 Jan 2006 12:01:24 -0000	1.7
@@ -33,6 +33,7 @@
 #include "glxext.h"
 #include "g_disptab.h"
 #include "g_disptab_EXT.h"
+#include "glapitable.h"
 #include "unpack.h"
 #include "impsize.h"
 #include "singlesize.h"
@@ -1703,7 +1704,7 @@
 
 	__GLX_GET_ANSWER_BUFFER(answer,cl,n,1);
 	retval =
-	(*__glRenderTableEXT->AreTexturesResidentEXT)( 
+	(*__glRenderTable->AreTexturesResidentEXT)( 
 		*(GLsizei  *)(pc + 0),
 		(GLuint   *)(pc + 4),
 		(GLboolean *) answer
@@ -1752,7 +1753,7 @@
 	n = *(GLsizei *)(pc + 0);
 
 	__GLX_GET_ANSWER_BUFFER(answer,cl,n*4,4);
-	(*__glRenderTableEXT->GenTexturesEXT)( 
+	(*__glRenderTable->GenTexturesEXT)( 
 		*(GLsizei  *)(pc + 0),
 		(GLuint   *) answer
 	);
@@ -1776,7 +1777,7 @@
 	pc += __GLX_VENDPRIV_HDR_SIZE;
 
 	retval =
-	(*__glRenderTableEXT->IsTextureEXT)( 
+	(*__glRenderTable->IsTextureEXT)( 
 		*(GLuint   *)(pc + 0)
 	);
 	__GLX_PUT_RETVAL(retval);

Index: g_singleswap.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/g_singleswap.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- g_singleswap.c	10 Jun 2005 12:30:39 -0000	1.6
+++ g_singleswap.c	5 Jan 2006 12:01:24 -0000	1.7
@@ -33,6 +33,7 @@
 #include "glxext.h"
 #include "g_disptab.h"
 #include "g_disptab_EXT.h"
+#include "glapitable.h"
 #include "unpack.h"
 #include "impsize.h"
 #include "singlesize.h"
@@ -2102,7 +2103,7 @@
 
 	__GLX_GET_ANSWER_BUFFER(answer,cl,n,1);
 	retval =
-	(*__glRenderTableEXT->AreTexturesResidentEXT)( 
+	(*__glRenderTable->AreTexturesResidentEXT)( 
 		*(GLsizei  *)(pc + 0),
 		(GLuint   *)(pc + 4),
 		(GLboolean *) answer
@@ -2162,7 +2163,7 @@
 	n = *(GLsizei *)(pc + 0);
 
 	__GLX_GET_ANSWER_BUFFER(answer,cl,n*4,4);
-	(*__glRenderTableEXT->GenTexturesEXT)( 
+	(*__glRenderTable->GenTexturesEXT)( 
 		*(GLsizei  *)(pc + 0),
 		(GLuint   *) answer
 	);
@@ -2191,7 +2192,7 @@
 	__GLX_SWAP_INT(pc + 0);
 
 	retval =
-	(*__glRenderTableEXT->IsTextureEXT)( 
+	(*__glRenderTable->IsTextureEXT)( 
 		*(GLuint   *)(pc + 0)
 	);
 	__GLX_PUT_RETVAL(retval);

Index: glxcmds.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/glxcmds.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- glxcmds.c	3 Jan 2006 09:43:40 -0000	1.17
+++ glxcmds.c	5 Jan 2006 12:01:24 -0000	1.18
@@ -40,6 +40,7 @@
 #include <GL/glxtokens.h>
 #include <unpack.h>
 #include "g_disptab.h"
+#include "glapitable.h"
 #include <pixmapstr.h>
 #include <windowstr.h>
 #include "g_disptab_EXT.h"
@@ -50,15 +51,12 @@
 
 /************************************************************************/
 
-__glProcTable     *__glRenderTable     = NULL;
-__glProcTableEXT  *__glRenderTableEXT  = NULL;
+struct _glapi_table *__glRenderTable = NULL;
 
 void
-GlxSetRenderTables (__glProcTable    *table,
-		    __glProcTableEXT *tableEXT)
+GlxSetRenderTables (struct _glapi_table    *table)
 {
     __glRenderTable = table;
-    __glRenderTableEXT = tableEXT;
 }
 
 static __GLimports imports = {
@@ -1884,11 +1882,11 @@
 
     switch( vendorcode ) {
     case X_GLvop_SampleMaskSGIS:
-	(*__glRenderTableEXT->SampleMaskSGIS)(*(GLfloat *)(pc + 4),
+	(*__glRenderTable->SampleMaskSGIS)(*(GLfloat *)(pc + 4),
 			 *(GLboolean *)(pc + 8));
 	return Success;
     case X_GLvop_SamplePatternSGIS:
-	(*__glRenderTableEXT->SamplePatternSGIS)( *(GLenum *)(pc + 4));
+	(*__glRenderTable->SamplePatternSGIS)( *(GLenum *)(pc + 4));
 	return Success;
     case X_GLXvop_BindTexImageMESA:
 	return __glXBindTexImageEXT(cl, pc);

Index: glxcmdsswap.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/glxcmdsswap.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- glxcmdsswap.c	3 Jan 2006 09:43:40 -0000	1.9
+++ glxcmdsswap.c	5 Jan 2006 12:01:24 -0000	1.10
@@ -46,6 +46,7 @@
 #include <windowstr.h>
 #include "glxext.h"
 #include "GL/glx_ansic.h"
+#include "glapitable.h"
 
 /************************************************************************/
 
@@ -1056,12 +1057,12 @@
     case X_GLvop_SampleMaskSGIS:
 	__GLX_SWAP_FLOAT(pc + 4);
 	__GLX_SWAP_INT(pc + 8);
-	(*__glRenderTableEXT->SampleMaskSGIS)(*(GLfloat *)(pc + 4),
+	(*__glRenderTable->SampleMaskSGIS)(*(GLfloat *)(pc + 4),
 			 *(GLboolean *)(pc + 8));
 	return Success;
     case X_GLvop_SamplePatternSGIS:
 	__GLX_SWAP_INT(pc + 4);
-	(*__glRenderTableEXT->SamplePatternSGIS)( *(GLenum *)(pc + 4));
+	(*__glRenderTable->SamplePatternSGIS)( *(GLenum *)(pc + 4));
 	return Success;
     case X_GLXvop_BindTexImageMESA:
 	return __glXSwapBindTexImageEXT(cl, pc);

Index: glxserver.h
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/glxserver.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- glxserver.h	3 Jan 2006 09:43:40 -0000	1.11
+++ glxserver.h	5 Jan 2006 12:01:24 -0000	1.12
@@ -771,10 +771,8 @@
     void (*GenerateMipmapEXT) (GLenum target);
 } __glProcTableEXT;
 
-extern __glProcTable     *__glRenderTable;
-extern __glProcTableEXT  *__glRenderTableEXT;
+extern struct _glapi_table *__glRenderTable;
 
-extern void GlxSetRenderTables (__glProcTable    *table,
-				__glProcTableEXT *tableEXT);
+extern void GlxSetRenderTables (struct _glapi_table    *table);
 
 #endif

Index: render2.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/render2.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- render2.c	7 Jun 2005 15:25:02 -0000	1.5
+++ render2.c	5 Jan 2006 12:01:24 -0000	1.6
@@ -39,6 +39,7 @@
 #include "unpack.h"
 #include "g_disptab.h"
 #include "g_disptab_EXT.h"
+#include "glapitable.h"
 
 extern GLint __glEvalComputeK(GLenum target);
 
@@ -222,11 +223,11 @@
 	    break;
 	  case GL_SECONDARY_COLOR_ARRAY:
 	    (*__glRenderTable->EnableClientState)(GL_SECONDARY_COLOR_ARRAY);
-	    (*__glRenderTableEXT->SecondaryColorPointerEXT)(numVals, datatype, stride, pc);
+	    (*__glRenderTable->SecondaryColorPointerEXT)(numVals, datatype, stride, pc);
 	    break;
 	  case GL_FOG_COORD_ARRAY:
 	    (*__glRenderTable->EnableClientState)(GL_FOG_COORD_ARRAY);
-	    (*__glRenderTableEXT->FogCoordPointerEXT)(datatype, stride, pc);
+	    (*__glRenderTable->FogCoordPointerEXT)(datatype, stride, pc);
 	    break;
 	  default:
 	    break;

Index: render2swap.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/render2swap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- render2swap.c	7 Jun 2005 15:25:02 -0000	1.5
+++ render2swap.c	5 Jan 2006 12:01:24 -0000	1.6
@@ -39,7 +39,7 @@
 #include "unpack.h"
 #include "g_disptab.h"
 #include "g_disptab_EXT.h"
-
+#include "glapitable.h"
 extern GLint __glEvalComputeK(GLenum target);
 
 void __glXDispSwap_Map1f(GLbyte *pc)

Index: renderpix.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/renderpix.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- renderpix.c	7 Jun 2005 15:25:02 -0000	1.4
+++ renderpix.c	5 Jan 2006 12:01:24 -0000	1.5
@@ -39,6 +39,7 @@
 #include "unpack.h"
 #include "g_disptab.h"
 #include "g_disptab_EXT.h"
+#include "glapitable.h"
 
 void __glXDisp_PolygonStipple(GLbyte *pc)
 {

Index: renderpixswap.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/renderpixswap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- renderpixswap.c	7 Jun 2005 15:25:02 -0000	1.4
+++ renderpixswap.c	5 Jan 2006 12:01:24 -0000	1.5
@@ -39,6 +39,7 @@
 #include "unpack.h"
 #include "g_disptab.h"
 #include "g_disptab_EXT.h"
+#include "glapitable.h"
 
 void __glXDispSwap_PolygonStipple(GLbyte *pc)
 {

Index: single2.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/single2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- single2.c	7 Jun 2005 15:25:02 -0000	1.6
+++ single2.c	5 Jan 2006 12:01:25 -0000	1.7
@@ -40,6 +40,7 @@
 #include "glxext.h"
 #include "unpack.h"
 #include "g_disptab.h"
+#include "glapitable.h"
 #include "GL/glx_ansic.h"
 
 int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)

Index: single2swap.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/single2swap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- single2swap.c	7 Jun 2005 15:25:02 -0000	1.5
+++ single2swap.c	5 Jan 2006 12:01:25 -0000	1.6
@@ -40,6 +40,7 @@
 #include "glxext.h"
 #include "unpack.h"
 #include "g_disptab.h"
+#include "glapitable.h"
 #include "GL/glx_ansic.h"
 
 int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)

Index: singlepix.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/singlepix.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- singlepix.c	7 Jun 2005 15:25:02 -0000	1.4
+++ singlepix.c	5 Jan 2006 12:01:25 -0000	1.5
@@ -41,6 +41,7 @@
 #include "unpack.h"
 #include "g_disptab.h"
 #include "g_disptab_EXT.h"
+#include "glapitable.h"
 
 int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
 {

Index: singlepixswap.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/singlepixswap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- singlepixswap.c	7 Jun 2005 15:25:02 -0000	1.5
+++ singlepixswap.c	5 Jan 2006 12:01:25 -0000	1.6
@@ -41,6 +41,7 @@
 #include "unpack.h"
 #include "g_disptab.h"
 #include "g_disptab_EXT.h"
+#include "glapitable.h"
 
 int __glXDispSwap_ReadPixels(__GLXclientState *cl, GLbyte *pc)
 {

Index: singlesize.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/singlesize.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- singlesize.c	3 Jan 2006 09:43:40 -0000	1.10
+++ singlesize.c	5 Jan 2006 12:01:25 -0000	1.11
@@ -37,6 +37,7 @@
 #include <GL/gl.h>
 #include "singlesize.h"
 #include "glxserver.h"
+#include "glapitable.h"
 
 /*
 ** These routines compute the size of variable-size returned parameters.

Index: xfont.c
===================================================================
RCS file: /cvs/xserver/xserver/GL/glx/xfont.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xfont.c	7 Jun 2005 15:25:02 -0000	1.4
+++ xfont.c	5 Jan 2006 12:01:25 -0000	1.5
@@ -43,6 +43,7 @@
 #include <pixmapstr.h>
 #include <windowstr.h>
 #include <dixfontstr.h>
+#include "glapitable.h"
 
 extern XID clientErrorValue;	/* imported kludge from dix layer */

More information about the xserver-commit mailing list