[xserver-commit] xserver/mi miinitext.c,3.73,3.74

[Eric Anholt]

Committed by: anholt

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

Modified Files:
	miinitext.c 
Log Message:
Merge dri-0-1-branch to trunk.  Notable changes:
- Add libdrm and libdri.  Portions of the DRI extension are stubbed
  out.
- Use the DRM in the ATI driver when available.  This provides a
  minor performance improvement in x11perf, and opens the possibility
  of using the 3d hardware for acceleration in the future.
- Implement solid fill acceleration for Composite in KAA.
- Implement Blend hook for Composite and use it on r128.
- Fix a bug of mine that resulted in overuse of offscreen memory.
- Fix many miscellaneous bugs in ATI driver and add PCI IDs.


Index: miinitext.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/miinitext.c,v
retrieving revision 3.73
retrieving revision 3.74
diff -u -d -r3.73 -r3.74
--- miinitext.c	5 Nov 2003 05:45:31 -0000	3.73
+++ miinitext.c	29 Dec 2003 06:24:01 -0000	3.74
@@ -199,9 +199,6 @@
 extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *);
 #endif
 #endif
-#ifdef XF86DRI
-extern void XFree86DRIExtensionInit(INITARGS);
-#endif
 #ifdef TOGCUP
 extern void XcupExtensionInit(INITARGS);
 #endif
@@ -341,9 +338,6 @@
 #if defined(XFreeXDGA)
     XFree86DGAExtensionInit();
 #endif
-#ifdef XF86DRI
-    XFree86DRIExtensionInit();
-#endif
 #endif
 #ifdef GLXEXT
 #ifndef XPRINT	/* we don't want Glx in the Xprint server */