[xserver-commit] xserver/dri Makefile.am,1.2,1.3 dri.c,1.2,1.3

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver/dri
In directory pdx:/home/anholt/xserver/dri

Modified Files:
	Makefile.am dri.c 
Log Message:
- Connect GLX files to the build after repocopy from DRI CVS.  Controlled
  by --enable-glx switch to ./configure.  GLX won't work until an upcoming
  commit to fb/
- Fix up dri/ to handle building with GLX.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/dri/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	29 Dec 2003 06:24:01 -0000	1.2
+++ Makefile.am	25 Jan 2004 05:24:11 -0000	1.3
@@ -1,6 +1,15 @@
+if GLX
+GLX_INCLUDES = 			\
+	-I$(top_srcdir)/GL/glx	\
+	-I$(top_srcdir)/GL/include \
+	-I$(top_srcdir)/GL/include \
+	-I@MESA_SOURCE@/include
+endif
+
 INCLUDES = 			\
 	-I$(top_srcdir)/mi	\
 	-I$(top_srcdir)/drm	\
+	$(GLX_INCLUDES)		\
 	@XSERVER_CFLAGS@
 
 noinst_LIBRARIES = libdri.a

Index: dri.c
===================================================================
RCS file: /cvs/xserver/xserver/dri/dri.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dri.c	29 Dec 2003 06:24:01 -0000	1.2
+++ dri.c	25 Jan 2004 05:24:11 -0000	1.3
@@ -37,6 +37,10 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include <X11/X.h>
@@ -49,14 +53,13 @@
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
-#define _XF86DRI_SERVER_
 #include "xf86dristr.h"
 #include "swaprep.h"
 #include "dri.h"
 #include "sarea.h"
 #include "dristruct.h"
 #include "libdrm.h"
-#ifdef GLX
+#ifdef GLXEXT
 #include "glxserver.h"
 #endif
 #include "mi.h"
@@ -709,7 +712,7 @@
 DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-#ifdef GLX
+#ifdef GLXEXT
     __GLXscreenInfo *pGLXScreen = &__glXActiveScreens[pScreen->myNum];
     __GLXvisualConfig *pGLXVis = pGLXScreen->pGlxVisual;
     void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
@@ -723,7 +726,7 @@
 
     visual = pScreen->visuals;
 
-#ifdef GLX
+#ifdef GLXEXT
     /* Find the X visual that corresponds the the first GLX visual */
     for (visNum = 0;
 	 visNum < pScreen->numVisuals;
@@ -781,7 +784,7 @@
                  XID context, drmContextPtr pHWContext)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-#ifdef GLX
+#ifdef GLXEXT
     __GLXscreenInfo *pGLXScreen = &__glXActiveScreens[pScreen->myNum];
     __GLXvisualConfig *pGLXVis = pGLXScreen->pGlxVisual;
     void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
@@ -800,7 +803,7 @@
 	}
     }
 
-#ifdef GLX
+#ifdef GLXEXT
     /* Find the GLX visual associated with the one requested */
     for (visNum = 0;
 	 visNum < pGLXScreen->numVisuals;
@@ -1900,7 +1903,7 @@
     *patchVersion = XF86DRI_PATCH_VERSION;
 }
 
-#if 0 /* XXX */
+#ifdef XFree86Server
 static void
 _DRIAdjustFrame(ScrnInfoPtr pScrn, DRIScreenPrivPtr pDRIPriv, int x, int y)
 {
@@ -1953,7 +1956,7 @@
 
     _DRIAdjustFrame(pScrn, pDRIPriv, x, y);
 }
-#endif
+#endif /* XFree86Server */
 
 /* WARNING WARNING WARNING: Just like every other function call in this
    file, the DRIOpenFullScreen and DRICloseFullScreen calls are for
@@ -1964,7 +1967,7 @@
    extension that performs expanded functionality, that is designed for
    used by application-level programs, and that should be portable
    across multiple GLX implementations. */
-#ifdef GLX
+#if 0
 Bool
 DRIOpenFullScreen(ScreenPtr pScreen, DrawablePtr pDrawable)
 {
@@ -2057,7 +2060,7 @@
 {
 	return FALSE;
 }
-#endif /* GLX */
+#endif
 
 /* 
  * DRIMoveBuffersHelper swaps the regions rects in place leaving you