xserver ChangeLog,3.382,3.383 configure.ac,3.111,3.112

[Dave Airlie]

Committed by: airlied

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
switch GLX and Xgl to use Mesa's "glapitable.h"


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.382
retrieving revision 3.383
diff -u -d -r3.382 -r3.383
--- ChangeLog	3 Jan 2006 16:16:37 -0000	3.382
+++ ChangeLog	5 Jan 2006 12:01:22 -0000	3.383
@@ -1,3 +1,98 @@
+2006-01-05  Dave Airlie  <airlied at linux.ie>
+
+	* GL/glx/Makefile.am:
+	* GL/glx/g_render.c: (__glXDisp_ActiveTextureARB),
+	(__glXDisp_MultiTexCoord1dvARB), (__glXDisp_MultiTexCoord1fvARB),
+	(__glXDisp_MultiTexCoord1ivARB), (__glXDisp_MultiTexCoord1svARB),
+	(__glXDisp_MultiTexCoord2dvARB), (__glXDisp_MultiTexCoord2fvARB),
+	(__glXDisp_MultiTexCoord2ivARB), (__glXDisp_MultiTexCoord2svARB),
+	(__glXDisp_MultiTexCoord3dvARB), (__glXDisp_MultiTexCoord3fvARB),
+	(__glXDisp_MultiTexCoord3ivARB), (__glXDisp_MultiTexCoord3svARB),
+	(__glXDisp_MultiTexCoord4dvARB), (__glXDisp_MultiTexCoord4fvARB),
+	(__glXDisp_MultiTexCoord4ivARB), (__glXDisp_MultiTexCoord4svARB),
+	(__glXDisp_PointParameterfARB), (__glXDisp_PointParameterfvARB),
+	(__glXDisp_ActiveStencilFaceEXT), (__glXDisp_WindowPos3fARB),
+	(__glXDisp_SampleCoverageARB):
+	* GL/glx/g_renderswap.c: (__glXDispSwap_ActiveTextureARB),
+	(__glXDispSwap_MultiTexCoord1dvARB),
+	(__glXDispSwap_MultiTexCoord1fvARB),
+	(__glXDispSwap_MultiTexCoord1ivARB),
+	(__glXDispSwap_MultiTexCoord1svARB),
+	(__glXDispSwap_MultiTexCoord2dvARB),
+	(__glXDispSwap_MultiTexCoord2fvARB),
+	(__glXDispSwap_MultiTexCoord2ivARB),
+	(__glXDispSwap_MultiTexCoord2svARB),
+	(__glXDispSwap_MultiTexCoord3dvARB),
+	(__glXDispSwap_MultiTexCoord3fvARB),
+	(__glXDispSwap_MultiTexCoord3ivARB),
+	(__glXDispSwap_MultiTexCoord3svARB),
+	(__glXDispSwap_MultiTexCoord4dvARB),
+	(__glXDispSwap_MultiTexCoord4fvARB),
+	(__glXDispSwap_MultiTexCoord4ivARB),
+	(__glXDispSwap_MultiTexCoord4svARB),
+	(__glXDispSwap_PointParameterfARB),
+	(__glXDispSwap_PointParameterfvARB),
+	(__glXDispSwap_ActiveStencilFaceEXT),
+	(__glXDispSwap_WindowPos3fARB), (__glXDispSwap_SampleCoverageARB):
+	* GL/glx/g_single.c: (__glXDisp_AreTexturesResidentEXT),
+	(__glXDisp_GenTexturesEXT), (__glXDisp_IsTextureEXT):
+	* GL/glx/g_singleswap.c: (__glXDispSwap_AreTexturesResidentEXT),
+	(__glXDispSwap_GenTexturesEXT), (__glXDispSwap_IsTextureEXT):
+	* GL/glx/glxcmds.c: (GlxSetRenderTables), (__glXVendorPrivate):
+	* GL/glx/glxcmdsswap.c: (__glXSwapVendorPrivate):
+	* GL/glx/glxserver.h:
+	* GL/glx/render2.c: (__glXDisp_DrawArrays):
+	* GL/glx/render2swap.c:
+	* GL/glx/renderpix.c:
+	* GL/glx/renderpixswap.c:
+	* GL/glx/single2.c:
+	* GL/glx/single2swap.c:
+	* GL/glx/singlepix.c:
+	* GL/glx/singlepixswap.c:
+	* GL/glx/singlesize.c:
+	* GL/glx/xfont.c:
+	* GL/mesa/X/xf86glx.c: (__MESA_forceCurrent):
+	* GL/mesa/X/xf86glxddx.c:
+	* configure.ac:
+	* hw/xgl/glxext/xglglxext.c: (xglRectd), (xglRectf), (xglRecti),
+	(xglRects), (xglSetCurrentContext), (xglLoseCurrent),
+	(xglLoseCurrentContext):
+	* hw/xgl/glxext/xglglxlog.c: (logActiveTextureARB),
+	(logClientActiveTextureARB), (logMultiTexCoord1dvARB),
+	(logMultiTexCoord1fvARB), (logMultiTexCoord1ivARB),
+	(logMultiTexCoord1svARB), (logMultiTexCoord2dvARB),
+	(logMultiTexCoord2fvARB), (logMultiTexCoord2ivARB),
+	(logMultiTexCoord2svARB), (logMultiTexCoord3dvARB),
+	(logMultiTexCoord3fvARB), (logMultiTexCoord3ivARB),
+	(logMultiTexCoord3svARB), (logMultiTexCoord4dvARB),
+	(logMultiTexCoord4fvARB), (logMultiTexCoord4ivARB),
+	(logMultiTexCoord4svARB), (logSampleCoverageARB),
+	(logAreTexturesResidentEXT), (logGenTexturesEXT),
+	(logIsTextureEXT), (logSampleMaskSGIS), (logSamplePatternSGIS),
+	(logPointParameterfEXT), (logPointParameterfvEXT),
+	(logWindowPos3fMESA), (logBlendFuncSeparateEXT),
+	(logFogCoordfvEXT), (logFogCoorddvEXT), (logFogCoordPointerEXT),
+	(logSecondaryColor3bvEXT), (logSecondaryColor3dvEXT),
+	(logSecondaryColor3fvEXT), (logSecondaryColor3ivEXT),
+	(logSecondaryColor3svEXT), (logSecondaryColor3ubvEXT),
+	(logSecondaryColor3uivEXT), (logSecondaryColor3usvEXT),
+	(logSecondaryColorPointerEXT), (logPointParameteriNV),
+	(logPointParameterivNV), (logActiveStencilFaceEXT),
+	(logIsRenderbufferEXT), (logBindRenderbufferEXT),
+	(logDeleteRenderbuffersEXT), (logGenRenderbuffersEXT),
+	(logRenderbufferStorageEXT), (logGetRenderbufferParameterivEXT),
+	(logIsFramebufferEXT), (logBindFramebufferEXT),
+	(logDeleteFramebuffersEXT), (logGenFramebuffersEXT),
+	(logCheckFramebufferStatusEXT), (logFramebufferTexture1DEXT),
+	(logFramebufferTexture2DEXT), (logFramebufferTexture3DEXT),
+	(logFramebufferRenderbufferEXT),
+	(logGetFramebufferAttachmentParameterivEXT),
+	(logGenerateMipmapEXT), (GlxLogSetRenderTables):
+	* hw/xgl/xglglx.c: (GlxSetRenderTables):
+	* hw/xgl/xglglx.h:
+	Switch GLX and Xgl to using Mesa's "glapitable.h" table
+	instead of having a private table
+
 2006-01-03  David Reveman  <davidr at novell.com>
 
 	* configure.ac: Add XGL_GLXEXT_LIB to XGLX_LIBS and XEGL_LIBS.

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.111
retrieving revision 3.112
diff -u -d -r3.111 -r3.112
--- configure.ac	4 Jan 2006 12:42:30 -0000	3.111
+++ configure.ac	5 Jan 2006 12:01:23 -0000	3.112
@@ -245,7 +245,7 @@
 AM_CONDITIONAL(GLX, test x$GLX = xyes)
 if test "$GLX" = yes; then
 	AC_DEFINE(GLXEXT,1,[Build GLX extension])
-	GLX_INCS='-I$(top_srcdir)/GL/glx -I$(top_srcdir)/GL/include -I$(MESA_SOURCE)/include'
+	GLX_INCS='-I$(top_srcdir)/GL/glx -I$(top_srcdir)/GL/include -I$(MESA_SOURCE)/include -I$(MESA_SOURCE)/src/mesa/glapi/'
 	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libglcore.la'
 fi
 AC_SUBST([GLX_INCS])